@eclipse-glsp/server 2.4.0-next.119 → 2.4.0-next.120
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.
|
@@ -27,9 +27,13 @@ export declare class ConsoleLogger extends Logger {
|
|
|
27
27
|
warn(message: string, ...params: any[]): void;
|
|
28
28
|
error(message: string, ...params: any[]): void;
|
|
29
29
|
debug(message: string, ...params: any[]): void;
|
|
30
|
-
logMessage(message: string, ...params: any[]): string;
|
|
30
|
+
logMessage(level: LogLevel, message: string, ...params: any[]): string;
|
|
31
|
+
protected logCaller(): string;
|
|
32
|
+
protected logTimestamp(): string;
|
|
31
33
|
logAdditionals(...params: any[]): string;
|
|
34
|
+
protected logAdditionalsSeparator(): string;
|
|
32
35
|
stringify(param: unknown): string;
|
|
36
|
+
protected stringifyError(error: Error): string;
|
|
33
37
|
}
|
|
34
38
|
export declare function configureConsoleLogger<T extends LoggerConfigOptions>(context: BindingContext, options: T): void;
|
|
35
39
|
//# sourceMappingURL=console-logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console-logger.d.ts","sourceRoot":"","sources":["../../../src/common/utils/console-logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"console-logger.d.ts","sourceRoot":"","sources":["../../../src/common/utils/console-logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAA+D,MAAM,UAAU,CAAC;AAE9H;;;GAGG;AACH,qBACa,aAAc,SAAQ,MAAM;IAE1B,QAAQ,EAAE,QAAQ;IAClB,MAAM,CAAC;gBADP,QAAQ,GAAE,QAAwB,EAClC,MAAM,CAAC,oBAAQ;IAK1B,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM9C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM9C,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM;IAItE,SAAS,CAAC,SAAS,IAAI,MAAM;IAI7B,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC,cAAc,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM;IAIxC,SAAS,CAAC,uBAAuB,IAAI,MAAM;IAI3C,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM;IAIjC,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM;CAIjD;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,mBAAmB,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAW/G"}
|
|
@@ -39,42 +39,45 @@ let ConsoleLogger = class ConsoleLogger extends logger_1.Logger {
|
|
|
39
39
|
}
|
|
40
40
|
info(message, ...params) {
|
|
41
41
|
if (logger_1.LogLevel.info <= this.logLevel) {
|
|
42
|
-
console.info(this.logMessage(message, params));
|
|
42
|
+
console.info(this.logMessage(logger_1.LogLevel.info, message, ...params));
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
warn(message, ...params) {
|
|
46
46
|
if (logger_1.LogLevel.warn <= this.logLevel) {
|
|
47
|
-
console.warn(this.logMessage(message, params));
|
|
47
|
+
console.warn(this.logMessage(logger_1.LogLevel.warn, message, ...params));
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
error(message, ...params) {
|
|
51
51
|
if (logger_1.LogLevel.error <= this.logLevel) {
|
|
52
|
-
console.error(this.logMessage(message, params));
|
|
52
|
+
console.error(this.logMessage(logger_1.LogLevel.error, message, ...params));
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
55
|
debug(message, ...params) {
|
|
56
56
|
if (logger_1.LogLevel.debug <= this.logLevel) {
|
|
57
|
-
console.debug(this.logMessage(message, params));
|
|
57
|
+
console.debug(this.logMessage(logger_1.LogLevel.debug, message, ...params));
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
|
-
logMessage(message, ...params) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
return
|
|
60
|
+
logMessage(level, message, ...params) {
|
|
61
|
+
return `${this.logTimestamp()} ${(0, logger_1.asLogLevel)(level)} - ${this.logCaller()} ${message} ${this.logAdditionals(...params)}`;
|
|
62
|
+
}
|
|
63
|
+
logCaller() {
|
|
64
|
+
return this.caller ? `[${this.caller}]` : '';
|
|
65
|
+
}
|
|
66
|
+
logTimestamp() {
|
|
67
|
+
return new Date().toLocaleTimeString();
|
|
65
68
|
}
|
|
66
69
|
logAdditionals(...params) {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
return
|
|
70
|
+
return !params || params.length === 0 ? '' : params.map(param => this.stringify(param)).join(this.logAdditionalsSeparator());
|
|
71
|
+
}
|
|
72
|
+
logAdditionalsSeparator() {
|
|
73
|
+
return ',\n';
|
|
71
74
|
}
|
|
72
75
|
stringify(param) {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
}
|
|
77
|
-
|
|
76
|
+
return param instanceof Error ? this.stringifyError(param) : JSON.stringify(param, undefined, 4);
|
|
77
|
+
}
|
|
78
|
+
stringifyError(error) {
|
|
79
|
+
return `${error.message}
|
|
80
|
+
${error.stack || ''}`;
|
|
78
81
|
}
|
|
79
82
|
};
|
|
80
83
|
exports.ConsoleLogger = ConsoleLogger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console-logger.js","sourceRoot":"","sources":["../../../src/common/utils/console-logger.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAGlF,yCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"console-logger.js","sourceRoot":"","sources":["../../../src/common/utils/console-logger.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/server",
|
|
3
|
-
"version": "2.4.0-next.
|
|
3
|
+
"version": "2.4.0-next.120+867d5a7",
|
|
4
4
|
"description": "A js server framework for Eclipse GLSP",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"watch": "tsc -w"
|
|
59
59
|
},
|
|
60
60
|
"dependencies": {
|
|
61
|
-
"@eclipse-glsp/graph": "2.4.0-next.
|
|
61
|
+
"@eclipse-glsp/graph": "2.4.0-next.120+867d5a7",
|
|
62
62
|
"@eclipse-glsp/protocol": "next",
|
|
63
63
|
"@types/uuid": "8.3.1",
|
|
64
64
|
"commander": "^8.3.0",
|
|
@@ -78,5 +78,5 @@
|
|
|
78
78
|
"publishConfig": {
|
|
79
79
|
"access": "public"
|
|
80
80
|
},
|
|
81
|
-
"gitHead": "
|
|
81
|
+
"gitHead": "867d5a7e4136544e79983e45438f0a4ae051d221"
|
|
82
82
|
}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { BindingContext } from '@eclipse-glsp/protocol/lib/di';
|
|
18
18
|
import { injectable } from 'inversify';
|
|
19
|
-
import { LogLevel, Logger, LoggerConfigOptions, LoggerFactory, NullLogger, getRequestParentName } from './logger';
|
|
19
|
+
import { LogLevel, Logger, LoggerConfigOptions, LoggerFactory, NullLogger, asLogLevel, getRequestParentName } from './logger';
|
|
20
20
|
|
|
21
21
|
/**
|
|
22
22
|
* Simple logger implementation that forwards logging calls to the `console` and
|
|
@@ -33,48 +33,55 @@ export class ConsoleLogger extends Logger {
|
|
|
33
33
|
|
|
34
34
|
info(message: string, ...params: any[]): void {
|
|
35
35
|
if (LogLevel.info <= this.logLevel) {
|
|
36
|
-
console.info(this.logMessage(message, params));
|
|
36
|
+
console.info(this.logMessage(LogLevel.info, message, ...params));
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
warn(message: string, ...params: any[]): void {
|
|
41
41
|
if (LogLevel.warn <= this.logLevel) {
|
|
42
|
-
console.warn(this.logMessage(message, params));
|
|
42
|
+
console.warn(this.logMessage(LogLevel.warn, message, ...params));
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
error(message: string, ...params: any[]): void {
|
|
47
47
|
if (LogLevel.error <= this.logLevel) {
|
|
48
|
-
console.error(this.logMessage(message, params));
|
|
48
|
+
console.error(this.logMessage(LogLevel.error, message, ...params));
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
debug(message: string, ...params: any[]): void {
|
|
53
53
|
if (LogLevel.debug <= this.logLevel) {
|
|
54
|
-
console.debug(this.logMessage(message, params));
|
|
54
|
+
console.debug(this.logMessage(LogLevel.debug, message, ...params));
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
|
|
58
|
-
logMessage(message: string, ...params: any[]): string {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
58
|
+
logMessage(level: LogLevel, message: string, ...params: any[]): string {
|
|
59
|
+
return `${this.logTimestamp()} ${asLogLevel(level)} - ${this.logCaller()} ${message} ${this.logAdditionals(...params)}`;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
protected logCaller(): string {
|
|
63
|
+
return this.caller ? `[${this.caller}]` : '';
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
protected logTimestamp(): string {
|
|
67
|
+
return new Date().toLocaleTimeString();
|
|
63
68
|
}
|
|
64
69
|
|
|
65
70
|
logAdditionals(...params: any[]): string {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
71
|
+
return !params || params.length === 0 ? '' : params.map(param => this.stringify(param)).join(this.logAdditionalsSeparator());
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
protected logAdditionalsSeparator(): string {
|
|
75
|
+
return ',\n';
|
|
70
76
|
}
|
|
71
77
|
|
|
72
78
|
stringify(param: unknown): string {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
return
|
|
79
|
+
return param instanceof Error ? this.stringifyError(param) : JSON.stringify(param, undefined, 4);
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
protected stringifyError(error: Error): string {
|
|
83
|
+
return `${error.message}
|
|
84
|
+
${error.stack || ''}`;
|
|
78
85
|
}
|
|
79
86
|
}
|
|
80
87
|
|