@hestjs/logger 0.1.3 → 0.1.4
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 +2 -0
- package/dist/factory.js.map +1 -1
- package/dist/logger.d.ts +24 -6
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +105 -71
- package/dist/logger.js.map +1 -1
- package/dist/serializers.d.ts +2 -13
- package/dist/serializers.d.ts.map +1 -1
- package/dist/serializers.js +5 -5
- package/dist/serializers.js.map +1 -1
- package/dist/test-error-logging.d.ts +3 -0
- package/dist/test-error-logging.d.ts.map +1 -0
- package/dist/test-error-logging.js +44 -0
- package/dist/test-error-logging.js.map +1 -0
- package/dist/types.d.ts +18 -6
- package/dist/types.d.ts.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,CAwER;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
@@ -63,6 +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
68
|
};
|
67
69
|
pinoLogger = (0, pino_1.default)(pinoConfig, stream);
|
68
70
|
}
|
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/logger.d.ts
CHANGED
@@ -26,27 +26,45 @@ export declare class HestLogger implements Logger {
|
|
26
26
|
/**
|
27
27
|
* Fatal 级别日志
|
28
28
|
*/
|
29
|
-
fatal(
|
29
|
+
fatal(message: string, error: Error, ...args: any[]): void;
|
30
|
+
fatal(error: Error, message?: string, ...args: any[]): void;
|
31
|
+
fatal(obj: object, message?: string, ...args: any[]): void;
|
32
|
+
fatal(message: string, ...args: any[]): void;
|
30
33
|
/**
|
31
34
|
* Error 级别日志
|
32
35
|
*/
|
33
|
-
error(
|
36
|
+
error(message: string, error: Error, ...args: any[]): void;
|
37
|
+
error(error: Error, message?: string, ...args: any[]): void;
|
38
|
+
error(obj: object, message?: string, ...args: any[]): void;
|
39
|
+
error(message: string, ...args: any[]): void;
|
34
40
|
/**
|
35
41
|
* Warn 级别日志
|
36
42
|
*/
|
37
|
-
warn(
|
43
|
+
warn(message: string, error: Error, ...args: any[]): void;
|
44
|
+
warn(error: Error, message?: string, ...args: any[]): void;
|
45
|
+
warn(obj: object, message?: string, ...args: any[]): void;
|
46
|
+
warn(message: string, ...args: any[]): void;
|
38
47
|
/**
|
39
48
|
* Info 级别日志
|
40
49
|
*/
|
41
|
-
info(
|
50
|
+
info(message: string, error: Error, ...args: any[]): void;
|
51
|
+
info(error: Error, message?: string, ...args: any[]): void;
|
52
|
+
info(obj: object, message?: string, ...args: any[]): void;
|
53
|
+
info(message: string, ...args: any[]): void;
|
42
54
|
/**
|
43
55
|
* Debug 级别日志
|
44
56
|
*/
|
45
|
-
debug(
|
57
|
+
debug(message: string, error: Error, ...args: any[]): void;
|
58
|
+
debug(error: Error, message?: string, ...args: any[]): void;
|
59
|
+
debug(obj: object, message?: string, ...args: any[]): void;
|
60
|
+
debug(message: string, ...args: any[]): void;
|
46
61
|
/**
|
47
62
|
* Trace 级别日志
|
48
63
|
*/
|
49
|
-
trace(
|
64
|
+
trace(message: string, error: Error, ...args: any[]): void;
|
65
|
+
trace(error: Error, message?: string, ...args: any[]): void;
|
66
|
+
trace(obj: object, message?: string, ...args: any[]): void;
|
67
|
+
trace(message: string, ...args: any[]): void;
|
50
68
|
/**
|
51
69
|
* 刷新日志
|
52
70
|
*/
|
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
@@ -34,99 +34,133 @@ class HestLogger {
|
|
34
34
|
/**
|
35
35
|
* 构建日志对象
|
36
36
|
*/
|
37
|
-
buildLogObject(obj, message) {
|
37
|
+
buildLogObject(obj, message, ...args) {
|
38
38
|
const context = Object.keys(this._context).length > 0 ? this._context : undefined;
|
39
|
+
let logObj = { ...context };
|
40
|
+
let logMessage;
|
39
41
|
if (typeof obj === 'string') {
|
40
|
-
// logger.info('message') 或 logger.info('message',
|
41
|
-
|
42
|
-
|
43
|
-
|
42
|
+
// logger.info('message') 或 logger.info('message', error/data, ...)
|
43
|
+
logMessage = obj;
|
44
|
+
// 检查后续参数中是否有 Error 对象或其他数据
|
45
|
+
if (message !== undefined || args.length > 0) {
|
46
|
+
const allArgs = [message, ...args].filter(arg => arg !== undefined);
|
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) {
|
64
|
+
// 如果是普通对象,合并到日志对象中
|
65
|
+
Object.assign(logObj, arg);
|
66
|
+
}
|
67
|
+
}
|
44
68
|
}
|
45
|
-
|
46
|
-
|
47
|
-
|
69
|
+
}
|
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
|
+
}
|
48
88
|
}
|
49
89
|
}
|
50
90
|
else if (obj && typeof obj === 'object') {
|
51
91
|
// logger.info({ key: 'value' }, 'message') - 数据在前,消息在后
|
52
|
-
|
92
|
+
Object.assign(logObj, obj);
|
93
|
+
logMessage = message;
|
94
|
+
// 处理额外参数中的 Error 对象
|
95
|
+
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) {
|
111
|
+
Object.assign(logObj, arg);
|
112
|
+
}
|
113
|
+
}
|
53
114
|
}
|
54
115
|
else {
|
55
|
-
// logger.info() -
|
56
|
-
|
116
|
+
// logger.info() - 没有参数,或者 obj 是其他类型
|
117
|
+
logMessage = message;
|
118
|
+
// 处理额外参数
|
119
|
+
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) {
|
135
|
+
Object.assign(logObj, arg);
|
136
|
+
}
|
137
|
+
}
|
57
138
|
}
|
139
|
+
return [logObj, logMessage];
|
58
140
|
}
|
59
|
-
/**
|
60
|
-
* Fatal 级别日志
|
61
|
-
*/
|
62
141
|
fatal(obj, message, ...args) {
|
63
|
-
const [logObj, msg] = this.buildLogObject(obj, message);
|
64
|
-
|
65
|
-
this._pino.fatal(logObj, msg, ...args);
|
66
|
-
}
|
67
|
-
else {
|
68
|
-
this._pino.fatal(logObj, msg);
|
69
|
-
}
|
142
|
+
const [logObj, msg] = this.buildLogObject(obj, message, ...args);
|
143
|
+
this._pino.fatal(logObj, msg);
|
70
144
|
}
|
71
|
-
/**
|
72
|
-
* Error 级别日志
|
73
|
-
*/
|
74
145
|
error(obj, message, ...args) {
|
75
|
-
const [logObj, msg] = this.buildLogObject(obj, message);
|
76
|
-
|
77
|
-
this._pino.error(logObj, msg, ...args);
|
78
|
-
}
|
79
|
-
else {
|
80
|
-
this._pino.error(logObj, msg);
|
81
|
-
}
|
146
|
+
const [logObj, msg] = this.buildLogObject(obj, message, ...args);
|
147
|
+
this._pino.error(logObj, msg);
|
82
148
|
}
|
83
|
-
/**
|
84
|
-
* Warn 级别日志
|
85
|
-
*/
|
86
149
|
warn(obj, message, ...args) {
|
87
|
-
const [logObj, msg] = this.buildLogObject(obj, message);
|
88
|
-
|
89
|
-
this._pino.warn(logObj, msg, ...args);
|
90
|
-
}
|
91
|
-
else {
|
92
|
-
this._pino.warn(logObj, msg);
|
93
|
-
}
|
150
|
+
const [logObj, msg] = this.buildLogObject(obj, message, ...args);
|
151
|
+
this._pino.warn(logObj, msg);
|
94
152
|
}
|
95
|
-
/**
|
96
|
-
* Info 级别日志
|
97
|
-
*/
|
98
153
|
info(obj, message, ...args) {
|
99
|
-
const [logObj, msg] = this.buildLogObject(obj, message);
|
100
|
-
|
101
|
-
this._pino.info(logObj, msg, ...args);
|
102
|
-
}
|
103
|
-
else {
|
104
|
-
this._pino.info(logObj, msg);
|
105
|
-
}
|
154
|
+
const [logObj, msg] = this.buildLogObject(obj, message, ...args);
|
155
|
+
this._pino.info(logObj, msg);
|
106
156
|
}
|
107
|
-
/**
|
108
|
-
* Debug 级别日志
|
109
|
-
*/
|
110
157
|
debug(obj, message, ...args) {
|
111
|
-
const [logObj, msg] = this.buildLogObject(obj, message);
|
112
|
-
|
113
|
-
this._pino.debug(logObj, msg, ...args);
|
114
|
-
}
|
115
|
-
else {
|
116
|
-
this._pino.debug(logObj, msg);
|
117
|
-
}
|
158
|
+
const [logObj, msg] = this.buildLogObject(obj, message, ...args);
|
159
|
+
this._pino.debug(logObj, msg);
|
118
160
|
}
|
119
|
-
/**
|
120
|
-
* Trace 级别日志
|
121
|
-
*/
|
122
161
|
trace(obj, message, ...args) {
|
123
|
-
const [logObj, msg] = this.buildLogObject(obj, message);
|
124
|
-
|
125
|
-
this._pino.trace(logObj, msg, ...args);
|
126
|
-
}
|
127
|
-
else {
|
128
|
-
this._pino.trace(logObj, msg);
|
129
|
-
}
|
162
|
+
const [logObj, msg] = this.buildLogObject(obj, message, ...args);
|
163
|
+
this._pino.trace(logObj, msg);
|
130
164
|
}
|
131
165
|
/**
|
132
166
|
* 刷新日志
|
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;
|
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,mEAAmE;YACnE,UAAU,GAAG,GAAG,CAAC;YAEjB,2BAA2B;YAC3B,IAAI,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7C,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC;gBAEpE,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;oBAC1B,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;wBACzB,wBAAwB;wBACxB,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;4BAChB,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;wBACnB,CAAC;6BAAM,CAAC;4BACN,eAAe;4BACf,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;gCAC9B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;4BACvB,CAAC;iCAAM,CAAC;gCACN,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;4BACjC,CAAC;wBACH,CAAC;oBACH,CAAC;yBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;wBACnD,mBAAmB;wBACnB,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;oBAC7B,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;YAChC,gDAAgD;YAChD,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;YACjB,UAAU,GAAG,OAAO,CAAC;YAErB,SAAS;YACT,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,KAAK,GAAG,EAAE,CAAC;oBACxC,mBAAmB;oBACnB,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC9B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACvB,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;oBACjC,CAAC;gBACH,CAAC;qBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;oBACnD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC1C,uDAAuD;YACvD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC3B,UAAU,GAAG,OAAO,CAAC;YAErB,oBAAoB;YACpB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;oBACzB,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;wBAChB,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;oBACnB,CAAC;yBAAM,CAAC;wBACN,eAAe;wBACf,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;4BAC9B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;wBACvB,CAAC;6BAAM,CAAC;4BACN,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;wBACjC,CAAC;oBACH,CAAC;gBACH,CAAC;qBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;oBACnD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,oCAAoC;YACpC,UAAU,GAAG,OAAO,CAAC;YAErB,SAAS;YACT,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;oBACzB,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;wBAChB,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;oBACnB,CAAC;yBAAM,CAAC;wBACN,eAAe;wBACf,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;4BAC9B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;wBACvB,CAAC;6BAAM,CAAC;4BACN,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;wBACjC,CAAC;oBACH,CAAC;gBACH,CAAC;qBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;oBACnD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC9B,CAAC;IASD,KAAK,CAAC,GAAS,EAAE,OAAa,EAAE,GAAG,IAAW;QAC5C,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,CAAC;IASD,KAAK,CAAC,GAAS,EAAE,OAAa,EAAE,GAAG,IAAW;QAC5C,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,CAAC;IASD,IAAI,CAAC,GAAS,EAAE,OAAa,EAAE,GAAG,IAAW;QAC3C,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC;IASD,IAAI,CAAC,GAAS,EAAE,OAAa,EAAE,GAAG,IAAW;QAC3C,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC;IASD,KAAK,CAAC,GAAS,EAAE,OAAa,EAAE,GAAG,IAAW;QAC5C,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,CAAC;IASD,KAAK,CAAC,GAAS,EAAE,OAAa,EAAE,GAAG,IAAW;QAC5C,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,KAAK;QACH,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YAC3C,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;IACH,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,KAAa;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;CACF;AA7ND,gCA6NC"}
|
package/dist/serializers.d.ts
CHANGED
@@ -23,22 +23,11 @@ export declare const querySerializer: (query: any) => any;
|
|
23
23
|
* 获取默认序列化器
|
24
24
|
*/
|
25
25
|
export declare function getDefaultSerializers(): {
|
26
|
+
req: typeof stdSerializers.req;
|
27
|
+
res: typeof stdSerializers.res;
|
26
28
|
err: (err: Error) => any;
|
27
|
-
error: (err: Error) => any;
|
28
|
-
req: (req: any) => any;
|
29
|
-
res: (res: any) => any;
|
30
29
|
user: (user: any) => any;
|
31
30
|
query: (query: any) => any;
|
32
|
-
errWithCause(err: Error): stdSerializers.SerializedError;
|
33
|
-
mapHttpRequest(req: import("http").IncomingMessage): {
|
34
|
-
req: stdSerializers.SerializedRequest;
|
35
|
-
};
|
36
|
-
mapHttpResponse(res: import("http").ServerResponse): {
|
37
|
-
res: stdSerializers.SerializedResponse;
|
38
|
-
};
|
39
|
-
wrapErrorSerializer(customSerializer: stdSerializers.CustomErrorSerializer): (err: Error) => Record<string, any>;
|
40
|
-
wrapRequestSerializer(customSerializer: stdSerializers.CustomRequestSerializer): (req: import("http").IncomingMessage) => Record<string, any>;
|
41
|
-
wrapResponseSerializer(customSerializer: stdSerializers.CustomResponseSerializer): (res: import("http").ServerResponse) => Record<string, any>;
|
42
31
|
};
|
43
32
|
/**
|
44
33
|
* 创建自定义序列化器
|
@@ -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;;;eApFA,KAAK;iBA0DL,GAAG;mBAUD,GAAG;EA2BzC;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,12 +125,12 @@ exports.querySerializer = querySerializer;
|
|
125
125
|
*/
|
126
126
|
function getDefaultSerializers() {
|
127
127
|
return {
|
128
|
-
|
129
|
-
|
128
|
+
// 只使用 pino 标准的请求和响应序列化器
|
129
|
+
req: stdSerializers.req,
|
130
|
+
res: stdSerializers.res,
|
131
|
+
// 使用我们自定义的错误序列化器
|
130
132
|
err: exports.errorSerializer,
|
131
|
-
|
132
|
-
req: exports.requestSerializer,
|
133
|
-
res: exports.responseSerializer,
|
133
|
+
// 自定义序列化器
|
134
134
|
user: exports.userSerializer,
|
135
135
|
query: exports.querySerializer,
|
136
136
|
};
|
package/dist/serializers.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"serializers.js","sourceRoot":"","sources":["../src/serializers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyFA,sDAWC;AAKD,4CAWC;AApHD,qEAAuD;AAEvD;;GAEG;AACI,MAAM,eAAe,GAAG,CAAC,GAAU,EAAE,EAAE;IAC5C,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3C,OAAO;QACL,GAAG,UAAU;QACb,YAAY;QACZ,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,oBAAoB;QACpB,GAAG,CAAE,GAAW,CAAC,MAAM,IAAI,EAAE,MAAM,EAAG,GAAW,CAAC,MAAM,EAAE,CAAC;QAC3D,GAAG,CAAE,GAAW,CAAC,UAAU,IAAI,EAAE,UAAU,EAAG,GAAW,CAAC,UAAU,EAAE,CAAC;KACxE,CAAC;AACJ,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B;AAEF;;GAEG;AACI,MAAM,iBAAiB,GAAG,CAAC,GAAQ,EAAE,EAAE;IAC5C,IAAI,CAAC,GAAG;QAAE,OAAO,GAAG,CAAC;IAErB,OAAO;QACL,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,OAAO,EAAE;YACP,sBAAsB;YACtB,cAAc,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,cAAc,CAAC;YAC7C,YAAY,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC;YACzC,MAAM,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC;YAC/B,iBAAiB,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,iBAAiB,CAAC;YACnD,iBAAiB,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,iBAAiB,CAAC;SACpD;QACD,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa;QACxC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU;KACnC,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,iBAAiB,qBAqB5B;AAEF;;GAEG;AACI,MAAM,kBAAkB,GAAG,CAAC,GAAQ,EAAE,EAAE;IAC7C,IAAI,CAAC,GAAG;QAAE,OAAO,GAAG,CAAC;IAErB,OAAO;QACL,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,OAAO,EAAE;YACP,cAAc,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC;YAC/C,gBAAgB,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC;SACpD;KACF,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,kBAAkB,sBAU7B;AAEF;;GAEG;AACI,MAAM,cAAc,GAAG,CAAC,IAAS,EAAE,EAAE;IAC1C,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC;IACtD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AALW,QAAA,cAAc,kBAKzB;AAEF;;GAEG;AACI,MAAM,eAAe,GAAG,CAAC,KAAU,EAAE,EAAE;IAC5C,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IAEzB,OAAO;QACL,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,kBAAkB;QAClB,aAAa,EACX,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;KACjE,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,eAAe,mBAW1B;AAEF;;GAEG;AACH,SAAgB,qBAAqB;IACnC,OAAO;QACL,GAAG,cAAc
|
1
|
+
{"version":3,"file":"serializers.js","sourceRoot":"","sources":["../src/serializers.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"test-error-logging.d.ts","sourceRoot":"","sources":["../src/test-error-logging.ts"],"names":[],"mappings":""}
|
@@ -0,0 +1,44 @@
|
|
1
|
+
#!/usr/bin/env bun
|
2
|
+
"use strict";
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
4
|
+
const factory_1 = require("./factory");
|
5
|
+
// 创建测试 logger
|
6
|
+
const logger = (0, factory_1.createLogger)('ErrorTest');
|
7
|
+
// 创建一些测试错误
|
8
|
+
const simpleError = new Error('This is a simple error');
|
9
|
+
const complexError = new Error('Complex error with custom properties');
|
10
|
+
complexError.statusCode = 500;
|
11
|
+
complexError.code = 'INTERNAL_ERROR';
|
12
|
+
console.log('=== Testing Enhanced Error Logging ===\n');
|
13
|
+
// 测试 1: 直接传递错误消息和错误对象
|
14
|
+
console.log('Test 1: logger.error("报错了", error)');
|
15
|
+
logger.error('报错了', simpleError);
|
16
|
+
console.log('\nTest 2: logger.error("报错了", complexError)');
|
17
|
+
logger.error('报错了', complexError);
|
18
|
+
// 测试 3: 错误对象在前,消息在后
|
19
|
+
console.log('\nTest 3: logger.error(error, "发生了错误")');
|
20
|
+
logger.error(simpleError, '发生了错误');
|
21
|
+
// 测试 4: 只传递错误对象
|
22
|
+
console.log('\nTest 4: logger.error(error)');
|
23
|
+
logger.error(complexError);
|
24
|
+
// 测试 5: 错误与额外数据
|
25
|
+
console.log('\nTest 5: logger.error("API调用失败", error, { userId: 123, endpoint: "/api/users" })');
|
26
|
+
logger.error('API调用失败', simpleError, { userId: 123, endpoint: '/api/users' });
|
27
|
+
// 测试 6: 多个错误
|
28
|
+
console.log('\nTest 6: logger.error("多重错误", error1, error2)');
|
29
|
+
logger.error('多重错误', simpleError, complexError);
|
30
|
+
// 测试 7: 传统方式对比
|
31
|
+
console.log('\nTest 7: 传统方式 (应该仍然工作)');
|
32
|
+
logger.error({ err: simpleError }, '传统方式记录错误');
|
33
|
+
// 测试 8: 复杂场景
|
34
|
+
console.log('\nTest 8: 复杂场景');
|
35
|
+
const requestError = new Error('Request timeout');
|
36
|
+
requestError.timeout = 5000;
|
37
|
+
requestError.url = 'https://api.example.com';
|
38
|
+
logger.error('请求超时', requestError, {
|
39
|
+
requestId: 'req-123',
|
40
|
+
retry: 3,
|
41
|
+
metadata: { source: 'api-client' }
|
42
|
+
});
|
43
|
+
console.log('\n=== Error Logging Tests Complete ===');
|
44
|
+
//# sourceMappingURL=test-error-logging.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"test-error-logging.js","sourceRoot":"","sources":["../src/test-error-logging.ts"],"names":[],"mappings":";;;AAEA,uCAAyC;AAEzC,cAAc;AACd,MAAM,MAAM,GAAG,IAAA,sBAAY,EAAC,WAAW,CAAC,CAAC;AAEzC,WAAW;AACX,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;AACxD,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;AACtE,YAAoB,CAAC,UAAU,GAAG,GAAG,CAAC;AACtC,YAAoB,CAAC,IAAI,GAAG,gBAAgB,CAAC;AAE9C,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;AAExD,sBAAsB;AACtB,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;AAClD,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;AAEjC,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;AAC3D,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;AAElC,oBAAoB;AACpB,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;AACtD,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AAEnC,gBAAgB;AAChB,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;AAC7C,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;AAE3B,gBAAgB;AAChB,OAAO,CAAC,GAAG,CAAC,mFAAmF,CAAC,CAAC;AACjG,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;AAE9E,aAAa;AACb,OAAO,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;AAC9D,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;AAEhD,eAAe;AACf,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;AACvC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,UAAU,CAAC,CAAC;AAE/C,aAAa;AACb,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC9B,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;AACjD,YAAoB,CAAC,OAAO,GAAG,IAAI,CAAC;AACpC,YAAoB,CAAC,GAAG,GAAG,yBAAyB,CAAC;AAEtD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE;IACjC,SAAS,EAAE,SAAS;IACpB,KAAK,EAAE,CAAC;IACR,QAAQ,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE;CACnC,CAAC,CAAC;AAEH,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC"}
|
package/dist/types.d.ts
CHANGED
@@ -78,23 +78,35 @@ export interface Logger {
|
|
78
78
|
/** 获取子 Logger */
|
79
79
|
child(bindings: Record<string, any>): Logger;
|
80
80
|
/** Fatal 级别日志 */
|
81
|
-
fatal(message: string, ...args: any[]): void;
|
81
|
+
fatal(message: string, error: Error, ...args: any[]): void;
|
82
|
+
fatal(error: Error, message?: string, ...args: any[]): void;
|
82
83
|
fatal(obj: object, message?: string, ...args: any[]): void;
|
84
|
+
fatal(message: string, ...args: any[]): void;
|
83
85
|
/** Error 级别日志 */
|
84
|
-
error(message: string, ...args: any[]): void;
|
86
|
+
error(message: string, error: Error, ...args: any[]): void;
|
87
|
+
error(error: Error, message?: string, ...args: any[]): void;
|
85
88
|
error(obj: object, message?: string, ...args: any[]): void;
|
89
|
+
error(message: string, ...args: any[]): void;
|
86
90
|
/** Warn 级别日志 */
|
87
|
-
warn(message: string, ...args: any[]): void;
|
91
|
+
warn(message: string, error: Error, ...args: any[]): void;
|
92
|
+
warn(error: Error, message?: string, ...args: any[]): void;
|
88
93
|
warn(obj: object, message?: string, ...args: any[]): void;
|
94
|
+
warn(message: string, ...args: any[]): void;
|
89
95
|
/** Info 级别日志 */
|
90
|
-
info(message: string, ...args: any[]): void;
|
96
|
+
info(message: string, error: Error, ...args: any[]): void;
|
97
|
+
info(error: Error, message?: string, ...args: any[]): void;
|
91
98
|
info(obj: object, message?: string, ...args: any[]): void;
|
99
|
+
info(message: string, ...args: any[]): void;
|
92
100
|
/** Debug 级别日志 */
|
93
|
-
debug(message: string, ...args: any[]): void;
|
101
|
+
debug(message: string, error: Error, ...args: any[]): void;
|
102
|
+
debug(error: Error, message?: string, ...args: any[]): void;
|
94
103
|
debug(obj: object, message?: string, ...args: any[]): void;
|
104
|
+
debug(message: string, ...args: any[]): void;
|
95
105
|
/** Trace 级别日志 */
|
96
|
-
trace(message: string, ...args: any[]): void;
|
106
|
+
trace(message: string, error: Error, ...args: any[]): void;
|
107
|
+
trace(error: Error, message?: string, ...args: any[]): void;
|
97
108
|
trace(obj: object, message?: string, ...args: any[]): void;
|
109
|
+
trace(message: string, ...args: any[]): void;
|
98
110
|
/** 刷新日志 */
|
99
111
|
flush(): void;
|
100
112
|
/** 检查是否启用了指定级别 */
|
package/dist/types.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,MAAM,CAAC;AAEjD;;GAEG;AACH,oBAAY,QAAQ;IAClB,KAAK,UAAU;IACf,KAAK,UAAU;IACf,IAAI,SAAS;IACb,IAAI,SAAS;IACb,KAAK,UAAU;IACf,KAAK,UAAU;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,WAAW;IACX,KAAK,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC1B,WAAW;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa;IACb,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC,CAAC;IAClD,cAAc;IACd,UAAU,CAAC,EAAE;QACX,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC;QAClD,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClE,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KAC5D,CAAC;IACF,WAAW;IACX,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,aAAa;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG;QAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzD,WAAW;IACX,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IAClC,WAAW;IACX,KAAK,CAAC,EAAE;QACN,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;KACpE,CAAC;IACF,gBAAgB;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,cAAc;IACd,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,WAAW;IACX,KAAK,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,UAAU;IACV,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU;IACV,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,WAAW;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe;IACf,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB,wBAAwB;IACxB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAE1B,YAAY;IACZ,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAAC;IAExC,iBAAiB;IACjB,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC;IAE7C,iBAAiB;IACjB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|