@celljs/core 3.6.11 → 3.6.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/logger/abstract-logger.d.ts +2 -0
- package/lib/common/logger/abstract-logger.d.ts.map +1 -1
- package/lib/common/logger/abstract-logger.js +14 -4
- package/lib/common/logger/abstract-logger.js.map +1 -1
- package/lib/common/logger/logger-protocol.d.ts +1 -0
- package/lib/common/logger/logger-protocol.d.ts.map +1 -1
- package/lib/common/logger/logger-protocol.js.map +1 -1
- package/package.json +3 -3
- package/src/common/logger/abstract-logger.ts +2 -2
|
@@ -6,6 +6,8 @@ export declare abstract class AbstractLogger implements Logger {
|
|
|
6
6
|
protected readonly traceIdProvider?: TraceIdProvider;
|
|
7
7
|
protected timeRecords: Map<string, number>;
|
|
8
8
|
setContext(context?: string): void;
|
|
9
|
+
protected resolveContextString(context?: string): string;
|
|
10
|
+
protected resolvePrefix(): string;
|
|
9
11
|
protected log(message: any, context?: string, logFn?: (...args: any[]) => void): void;
|
|
10
12
|
time(label: string): void;
|
|
11
13
|
timeEnd(label: string, context?: string): number | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-logger.d.ts","sourceRoot":"","sources":["../../../src/common/logger/abstract-logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAgB,QAAQ,EAAgB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAElG,8BAAsB,cAAe,YAAW,MAAM;IAClD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAG3B,KAAK,EAAE,QAAQ,CAAC;IAGhB,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;IAErD,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAIlC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,GAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAmB,GAAG,IAAI;IAenG,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIzB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAa5D,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAC/D,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAChE,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAC/D,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;CACnE"}
|
|
1
|
+
{"version":3,"file":"abstract-logger.d.ts","sourceRoot":"","sources":["../../../src/common/logger/abstract-logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAgB,QAAQ,EAAgB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAElG,8BAAsB,cAAe,YAAW,MAAM;IAClD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAG3B,KAAK,EAAE,QAAQ,CAAC;IAGhB,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;IAErD,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAIlC,SAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;IAOxD,SAAS,CAAC,aAAa,IAAI,MAAM;IAKjC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,GAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAmB,GAAG,IAAI;IAenG,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIzB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAa5D,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAC/D,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAChE,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAC/D,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;CACnE"}
|
|
@@ -19,17 +19,27 @@ class AbstractLogger {
|
|
|
19
19
|
setContext(context) {
|
|
20
20
|
this.context = context;
|
|
21
21
|
}
|
|
22
|
+
resolveContextString(context) {
|
|
23
|
+
if (this.context) {
|
|
24
|
+
return context ? `[${this.context}] [${context}] ` : `[${this.context}] `;
|
|
25
|
+
}
|
|
26
|
+
return context ? `[${context}] ` : '';
|
|
27
|
+
}
|
|
28
|
+
resolvePrefix() {
|
|
29
|
+
const time = new Date().toISOString();
|
|
30
|
+
return `${time} [${this.level}]`;
|
|
31
|
+
}
|
|
22
32
|
log(message, context, logFn = console.info) {
|
|
23
33
|
var _a;
|
|
24
34
|
context = context !== null && context !== void 0 ? context : this.context;
|
|
25
|
-
const time = new Date().toISOString();
|
|
26
35
|
const traceId = (_a = this.traceIdProvider) === null || _a === void 0 ? void 0 : _a.provide();
|
|
27
36
|
const traceStr = traceId ? ` [trace: ${traceId}]` : '';
|
|
28
|
-
const contextStr = this.context
|
|
29
|
-
logFn(`${
|
|
37
|
+
const contextStr = this.resolveContextString(context);
|
|
38
|
+
logFn(`${this.resolvePrefix()}${traceStr}${contextStr} ${message}`);
|
|
30
39
|
logger_protocol_1.onLogEmitter.fire({
|
|
31
40
|
level: this.level,
|
|
32
41
|
traceId,
|
|
42
|
+
rootContext: this.context,
|
|
33
43
|
context,
|
|
34
44
|
message
|
|
35
45
|
});
|
|
@@ -42,7 +52,7 @@ class AbstractLogger {
|
|
|
42
52
|
if (start !== undefined) {
|
|
43
53
|
const duration = Date.now() - start;
|
|
44
54
|
this.timeRecords.delete(label);
|
|
45
|
-
this.log(`${label}
|
|
55
|
+
this.log(`${label} [${duration}ms]`, context);
|
|
46
56
|
return duration;
|
|
47
57
|
}
|
|
48
58
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-logger.js","sourceRoot":"","sources":["../../../src/common/logger/abstract-logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA2D;AAC3D,uDAAkG;AAElG,MAAsB,cAAc;IAApC;QAUc,gBAAW,GAAwB,IAAI,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"abstract-logger.js","sourceRoot":"","sources":["../../../src/common/logger/abstract-logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA2D;AAC3D,uDAAkG;AAElG,MAAsB,cAAc;IAApC;QAUc,gBAAW,GAAwB,IAAI,GAAG,EAAE,CAAC;IAsD3D,CAAC;IApDG,UAAU,CAAC,OAAgB;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAES,oBAAoB,CAAC,OAAgB;QAC3C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,MAAM,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC;QAC9E,CAAC;QACD,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1C,CAAC;IAES,aAAa;QACnB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACtC,OAAO,GAAG,IAAI,KAAK,IAAI,CAAC,KAAK,GAAG,CAAC;IACrC,CAAC;IAES,GAAG,CAAC,OAAY,EAAE,OAAgB,EAAE,QAAkC,OAAO,CAAC,IAAI;;QACxF,OAAO,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CAAC;QAClC,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,eAAe,0CAAE,OAAO,EAAE,CAAC;QAChD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,YAAY,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACtD,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,GAAG,QAAQ,GAAG,UAAU,IAAI,OAAO,EAAE,CAAC,CAAC;QACpE,8BAAY,CAAC,IAAI,CAAC;YACd,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO;YACP,WAAW,EAAE,IAAI,CAAC,OAAO;YACzB,OAAO;YACP,OAAO;SACV,CAAC,CAAC;IACP,CAAC;IAED,IAAI,CAAC,KAAa;QACd,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,KAAa,EAAE,OAAgB;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;YACpC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,QAAQ,KAAK,EAAE,OAAO,CAAC,CAAC;YAC9C,OAAO,QAAQ,CAAC;QACpB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,GAAG,CAAC,kBAAkB,KAAK,cAAc,EAAE,OAAO,CAAC,CAAC;YACzD,OAAO;QACX,CAAC;IACL,CAAC;CAMJ;AAhED,wCAgEC;AA3DG;IADC,IAAA,kBAAK,EAAC,GAAG,8BAAY,YAAY,CAAC;;6CACnB;AAGG;IADlB,IAAA,sBAAS,EAAC,iCAAe,CAAC;IAAE,IAAA,qBAAQ,GAAE;;uDACc"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-protocol.d.ts","sourceRoot":"","sources":["../../../src/common/logger/logger-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,eAAO,MAAM,aAAa,gBAAgB,CAAC;AAC3C,eAAO,MAAM,YAAY,sBAA2B,CAAC;AAErD,eAAO,MAAM,MAAM,eAAmB,CAAC;AACvC,eAAO,MAAM,eAAe,eAA4B,CAAC;AACzD,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AACvE,MAAM,WAAW,UAAU;IACvB,KAAK,EAAE,QAAQ,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,MAAM;IAKnB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CAEhE;AAED,eAAO,MAAM,YAAY,qBAA4B,CAAC;AAEtD,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,eAAe;IAC5B,OAAO,IAAI,MAAM,GAAG,SAAS,CAAC;CACjC"}
|
|
1
|
+
{"version":3,"file":"logger-protocol.d.ts","sourceRoot":"","sources":["../../../src/common/logger/logger-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,eAAO,MAAM,aAAa,gBAAgB,CAAC;AAC3C,eAAO,MAAM,YAAY,sBAA2B,CAAC;AAErD,eAAO,MAAM,MAAM,eAAmB,CAAC;AACvC,eAAO,MAAM,eAAe,eAA4B,CAAC;AACzD,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AACvE,MAAM,WAAW,UAAU;IACvB,KAAK,EAAE,QAAQ,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,MAAM;IAKnB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CAEhE;AAED,eAAO,MAAM,YAAY,qBAA4B,CAAC;AAEtD,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,eAAe;IAC5B,OAAO,IAAI,MAAM,GAAG,SAAS,CAAC;CACjC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-protocol.js","sourceRoot":"","sources":["../../../src/common/logger/logger-protocol.ts"],"names":[],"mappings":";;;AAAA,oCAA0C;AAC7B,QAAA,aAAa,GAAG,aAAa,CAAC;AAC9B,QAAA,YAAY,GAAG,GAAG,qBAAa,QAAQ,CAAC;AAExC,QAAA,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC1B,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAC5C,QAAA,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"logger-protocol.js","sourceRoot":"","sources":["../../../src/common/logger/logger-protocol.ts"],"names":[],"mappings":";;;AAAA,oCAA0C;AAC7B,QAAA,aAAa,GAAG,aAAa,CAAC;AAC9B,QAAA,YAAY,GAAG,GAAG,qBAAa,QAAQ,CAAC;AAExC,QAAA,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC1B,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAC5C,QAAA,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AA0BxC,QAAA,YAAY,GAAG,IAAI,eAAO,EAAc,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@celljs/core",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.13",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cell-component"
|
|
@@ -44,12 +44,12 @@
|
|
|
44
44
|
"tslib": "^2.8.0"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@celljs/component": "3.6.
|
|
47
|
+
"@celljs/component": "3.6.13",
|
|
48
48
|
"@types/jexl": "^2.2.0",
|
|
49
49
|
"@types/traverse": "^0.6.32"
|
|
50
50
|
},
|
|
51
51
|
"publishConfig": {
|
|
52
52
|
"access": "public"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "3f3b6502e2da7d4e34dac05be2e563f0734bd0f4"
|
|
55
55
|
}
|
|
@@ -24,7 +24,7 @@ export abstract class AbstractLogger implements Logger {
|
|
|
24
24
|
return context ? `[${context}] ` : '';
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
protected resolvePrefix(
|
|
27
|
+
protected resolvePrefix(): string {
|
|
28
28
|
const time = new Date().toISOString();
|
|
29
29
|
return `${time} [${this.level}]`;
|
|
30
30
|
}
|
|
@@ -34,7 +34,7 @@ export abstract class AbstractLogger implements Logger {
|
|
|
34
34
|
const traceId = this.traceIdProvider?.provide();
|
|
35
35
|
const traceStr = traceId ? ` [trace: ${traceId}]` : '';
|
|
36
36
|
const contextStr = this.resolveContextString(context);
|
|
37
|
-
logFn(`${this.resolvePrefix(
|
|
37
|
+
logFn(`${this.resolvePrefix()}${traceStr}${contextStr} ${message}`);
|
|
38
38
|
onLogEmitter.fire({
|
|
39
39
|
level: this.level,
|
|
40
40
|
traceId,
|