@sphereon/ssi-types 0.28.0 → 0.28.1-next.11
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/logging/index.d.ts +3 -2
- package/dist/logging/index.d.ts.map +1 -1
- package/dist/logging/index.js +39 -24
- package/dist/logging/index.js.map +1 -1
- package/package.json +2 -2
- package/src/logging/index.ts +38 -21
package/dist/logging/index.d.ts
CHANGED
|
@@ -50,7 +50,7 @@ export type ISimpleLogger<LogType> = {
|
|
|
50
50
|
trace(value: LogType, ...args: any[]): void;
|
|
51
51
|
warning(value: LogType, ...args: any[]): void;
|
|
52
52
|
error(value: LogType, ...args: any[]): void;
|
|
53
|
-
logl(level: LogLevel, value: LogType, ...
|
|
53
|
+
logl(level: LogLevel, value: LogType, ...argsW: any[]): void;
|
|
54
54
|
};
|
|
55
55
|
export declare class SimpleLogger implements ISimpleLogger<any> {
|
|
56
56
|
private _eventEmitter;
|
|
@@ -64,7 +64,8 @@ export declare class SimpleLogger implements ISimpleLogger<any> {
|
|
|
64
64
|
warning(value: any, ...args: any[]): void;
|
|
65
65
|
error(value: any, ...args: any[]): void;
|
|
66
66
|
logl(level: LogLevel, value: any, ...args: any[]): void;
|
|
67
|
-
|
|
67
|
+
private logImpl;
|
|
68
|
+
log(value: any, ...args: any[]): void;
|
|
68
69
|
}
|
|
69
70
|
export declare class SimpleRecordLogger extends SimpleLogger implements ISimpleLogger<Record<string, any>> {
|
|
70
71
|
constructor(opts?: SimpleLogOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/logging/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAErC,oBAAY,QAAQ;IAClB,KAAK,IAAI;IACT,KAAK,IAAA;IACL,IAAI,IAAA;IACJ,OAAO,IAAA;IACP,KAAK,IAAA;CACN;AAED,oBAAY,gBAAgB;IAC1B,KAAK,UAAU;IACf,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAA;IAC9B,KAAK,EAAE,QAAQ,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,IAAI,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,CAAC,EAAE,GAAG,CAAA;CACrB;AAED,oBAAY,SAAS;IACnB,SAAS,IAAA;IACT,OAAO,IAAA;IACP,KAAK,IAAA;CACN;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,CAAC,EAAE,QAAQ,CAAA;IAC1B,OAAO,CAAC,EAAE,SAAS,EAAE,CAAA;CACtB;AAED,wBAAgB,UAAU,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAO9E;AAED,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAgB;IACnD,gBAAuB,OAAO,EAAE,OAAO,CAGrC;IACF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqD;IACtF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyE;gBAErF,cAAc,CAAC,EAAE,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC;IAIzD,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC,GAAG,IAAI;IAK9E,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC,GAAG,IAAI;IAKzE,QAAQ,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;IAI1E,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;CAc/E;AAED,MAAM,MAAM,aAAa,CAAC,OAAO,IAAI;IACnC,OAAO,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAA;IACnC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IACzC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAC1C,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAC3C,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAC3C,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAC7C,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAC3C,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/logging/index.ts"],"names":[],"mappings":"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"}
|
package/dist/logging/index.js
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.SimpleRecordLogger = exports.SimpleLogger = exports.Loggers = exports.logOptions = exports.LogMethod = exports.LoggingEventType = exports.LogLevel = void 0;
|
|
7
|
-
const debug_1 =
|
|
4
|
+
const debug_1 = require("debug");
|
|
8
5
|
const events_1 = require("events");
|
|
9
6
|
var LogLevel;
|
|
10
7
|
(function (LogLevel) {
|
|
@@ -85,23 +82,27 @@ class SimpleLogger {
|
|
|
85
82
|
return this._options;
|
|
86
83
|
}
|
|
87
84
|
trace(value, ...args) {
|
|
88
|
-
this.
|
|
85
|
+
this.logImpl(LogLevel.TRACE, value, ...args);
|
|
89
86
|
}
|
|
90
87
|
debug(value, ...args) {
|
|
91
|
-
this.
|
|
88
|
+
this.logImpl(LogLevel.DEBUG, value, ...args);
|
|
92
89
|
}
|
|
93
90
|
info(value, ...args) {
|
|
94
|
-
this.
|
|
91
|
+
this.logImpl(LogLevel.INFO, value, ...args);
|
|
95
92
|
}
|
|
96
93
|
warning(value, ...args) {
|
|
97
|
-
this.
|
|
94
|
+
this.logImpl(LogLevel.WARNING, value, ...args);
|
|
98
95
|
}
|
|
99
96
|
error(value, ...args) {
|
|
100
|
-
this.
|
|
97
|
+
this.logImpl(LogLevel.ERROR, value, ...args);
|
|
101
98
|
}
|
|
102
99
|
logl(level, value, ...args) {
|
|
100
|
+
this.logImpl(level, value, ...args);
|
|
101
|
+
}
|
|
102
|
+
logImpl(level, value, ...args) {
|
|
103
|
+
var _a;
|
|
103
104
|
const date = new Date().toISOString();
|
|
104
|
-
const filteredArgs = args.filter((v) => v);
|
|
105
|
+
const filteredArgs = (_a = args === null || args === void 0 ? void 0 : args.filter((v) => v)) !== null && _a !== void 0 ? _a : [];
|
|
105
106
|
const arg = filteredArgs.length === 0 || filteredArgs[0] == undefined ? undefined : filteredArgs;
|
|
106
107
|
function toLogValue(options) {
|
|
107
108
|
if (typeof value === 'string') {
|
|
@@ -118,33 +119,47 @@ class SimpleLogger {
|
|
|
118
119
|
if (arg) {
|
|
119
120
|
logArgs.push(args);
|
|
120
121
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
122
|
+
let debugPkgEnabled = this.options.methods.includes(LogMethod.DEBUG_PKG);
|
|
123
|
+
if (debugPkgEnabled) {
|
|
124
|
+
const debugPkgDebugger = (0, debug_1.debug)(this._options.namespace);
|
|
125
|
+
// It was enabled at the options level in code, but could be disabled at runtime using env vars
|
|
126
|
+
debugPkgEnabled = debugPkgDebugger.enabled;
|
|
127
|
+
if (debugPkgEnabled) {
|
|
128
|
+
if (arg) {
|
|
129
|
+
debugPkgDebugger(`${date}- ${value},`, ...arg);
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
debugPkgDebugger(`${date}- ${value}`);
|
|
133
|
+
}
|
|
127
134
|
}
|
|
128
135
|
}
|
|
129
|
-
|
|
136
|
+
// We do not perform console.logs in case the debug package is enabled in code and used at runtime
|
|
137
|
+
if (this.options.methods.includes(LogMethod.CONSOLE) && !debugPkgEnabled) {
|
|
130
138
|
const [value, args] = logArgs;
|
|
139
|
+
let logMethod = console.info;
|
|
131
140
|
switch (level) {
|
|
132
141
|
case LogLevel.TRACE:
|
|
133
|
-
console.trace
|
|
142
|
+
logMethod = console.trace;
|
|
134
143
|
break;
|
|
135
144
|
case LogLevel.DEBUG:
|
|
136
|
-
console.debug
|
|
145
|
+
logMethod = console.debug;
|
|
137
146
|
break;
|
|
138
147
|
case LogLevel.INFO:
|
|
139
|
-
console.info
|
|
148
|
+
logMethod = console.info;
|
|
140
149
|
break;
|
|
141
150
|
case LogLevel.WARNING:
|
|
142
|
-
console.warn
|
|
151
|
+
logMethod = console.warn;
|
|
143
152
|
break;
|
|
144
153
|
case LogLevel.ERROR:
|
|
145
|
-
console.error
|
|
154
|
+
logMethod = console.error;
|
|
146
155
|
break;
|
|
147
156
|
}
|
|
157
|
+
if (args) {
|
|
158
|
+
logMethod(value + ',', ...args);
|
|
159
|
+
}
|
|
160
|
+
else {
|
|
161
|
+
logMethod(value);
|
|
162
|
+
}
|
|
148
163
|
}
|
|
149
164
|
if (this.options.methods.includes(LogMethod.EVENT)) {
|
|
150
165
|
this._eventEmitter.emit(this.options.eventName, {
|
|
@@ -156,8 +171,8 @@ class SimpleLogger {
|
|
|
156
171
|
});
|
|
157
172
|
}
|
|
158
173
|
}
|
|
159
|
-
log(value, args) {
|
|
160
|
-
this.
|
|
174
|
+
log(value, ...args) {
|
|
175
|
+
this.logImpl(this.options.defaultLogLevel, value, ...args);
|
|
161
176
|
}
|
|
162
177
|
}
|
|
163
178
|
exports.SimpleLogger = SimpleLogger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logging/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logging/index.ts"],"names":[],"mappings":";;;AAAA,iCAA6B;AAC7B,mCAAqC;AAErC,IAAY,QAMX;AAND,WAAY,QAAQ;IAClB,yCAAS,CAAA;IACT,yCAAK,CAAA;IACL,uCAAI,CAAA;IACJ,6CAAO,CAAA;IACP,yCAAK,CAAA;AACP,CAAC,EANW,QAAQ,wBAAR,QAAQ,QAMnB;AAED,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,mCAAe,CAAA;IACf,uCAAmB,CAAA;AACrB,CAAC,EAHW,gBAAgB,gCAAhB,gBAAgB,QAG3B;AAWD,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,mDAAS,CAAA;IACT,+CAAO,CAAA;IACP,2CAAK,CAAA;AACP,CAAC,EAJW,SAAS,yBAAT,SAAS,QAIpB;AASD,SAAgB,UAAU,CAAC,IAAuB;;IAChD,OAAO;QACL,SAAS,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,mCAAI,UAAU;QACxC,SAAS,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,mCAAI,kBAAkB;QAChD,eAAe,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,eAAe,mCAAI,QAAQ,CAAC,IAAI;QACvD,OAAO,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,mCAAI,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC;KACjE,CAAA;AACH,CAAC;AAPD,gCAOC;AAED,MAAa,OAAO;IASlB,YAAY,cAAoD;QAH/C,qBAAgB,GAA4C,IAAI,GAAG,EAAE,CAAA;QACrE,YAAO,GAA4D,IAAI,OAAO,EAAE,CAAA;QAG/F,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAA;IACjD,CAAC;IAEM,OAAO,CAAC,SAAiB,EAAE,OAA4C;QAC5E,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,iCAAM,OAAO,KAAE,SAAS,IAAG,CAAC,CAAA;QAC3E,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,cAAc,CAAC,OAA4C;QAChE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAC1C,OAAO,IAAI,CAAA;IACb,CAAC;IAED,QAAQ,CAAI,SAAiB,EAAE,MAAwB;QACrD,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;IACpC,CAAC;IAED,GAAG,CAAI,SAAiB,EAAE,cAAiC;;QACzD,MAAM,OAAO,GAAG,MAAA,MAAA,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,mCAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,mCAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QACjI,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,KAAK,CAAC,0CAA0C,SAAS,EAAE,CAAC,CAAA;QACpE,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAE7C,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,IAAI,YAAY,CAAC,OAAO,CAAC,CAAA;YACpD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QACnC,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;;AAxCH,0BAyCC;AAxCyB,mBAAW,GAAG,aAAa,AAAhB,CAAgB;AAC5B,eAAO,GAAY,IAAI,OAAO,CAAC;IACpD,eAAe,EAAE,QAAQ,CAAC,IAAI;IAC9B,OAAO,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC;CAChD,CAAC,AAH4B,CAG5B;AAiDJ,MAAa,YAAY;IAIvB,YAAY,IAAuB;QAH3B,kBAAa,GAAG,IAAI,qBAAY,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAA;QAInE,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAA;IAC3B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,KAAU,EAAE,GAAG,IAAW;QAC9B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,KAAK,CAAC,KAAU,EAAE,GAAG,IAAW;QAC9B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,IAAI,CAAC,KAAU,EAAE,GAAG,IAAW;QAC7B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAA;IAC7C,CAAC;IAED,OAAO,CAAC,KAAU,EAAE,GAAG,IAAW;QAChC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAA;IAChD,CAAC;IAED,KAAK,CAAC,KAAU,EAAE,GAAG,IAAW;QAC9B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,IAAI,CAAC,KAAe,EAAE,KAAU,EAAE,GAAG,IAAW;QAC9C,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAA;IACrC,CAAC;IAEO,OAAO,CAAC,KAAe,EAAE,KAAU,EAAE,GAAG,IAAW;;QACzD,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;QACrC,MAAM,YAAY,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAG,CAAC,mCAAI,EAAE,CAAA;QACnD,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAA;QAEhG,SAAS,UAAU,CAAC,OAAyB;YAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,OAAO,GAAG,IAAI,KAAK,OAAO,CAAC,SAAS,KAAK,KAAK,EAAE,CAAA;YAClD,CAAC;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACrC,KAAK,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,SAAS,CAAA;gBACtC,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAA;YACtB,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACzC,MAAM,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC1B,IAAI,GAAG,EAAE,CAAC;YACR,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACpB,CAAC;QACD,IAAI,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QACxE,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,gBAAgB,GAAG,IAAA,aAAK,EAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;YACvD,+FAA+F;YAC/F,eAAe,GAAG,gBAAgB,CAAC,OAAO,CAAA;YAC1C,IAAI,eAAe,EAAE,CAAC;gBACpB,IAAI,GAAG,EAAE,CAAC;oBACR,gBAAgB,CAAC,GAAG,IAAI,KAAK,KAAK,GAAG,EAAE,GAAG,GAAG,CAAC,CAAA;gBAChD,CAAC;qBAAM,CAAC;oBACN,gBAAgB,CAAC,GAAG,IAAI,KAAK,KAAK,EAAE,CAAC,CAAA;gBACvC,CAAC;YACH,CAAC;QACH,CAAC;QAED,kGAAkG;QAClG,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YACzE,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,OAAO,CAAA;YAC7B,IAAI,SAAS,GAAG,OAAO,CAAC,IAAI,CAAA;YAC5B,QAAQ,KAAK,EAAE,CAAC;gBACd,KAAK,QAAQ,CAAC,KAAK;oBACjB,SAAS,GAAG,OAAO,CAAC,KAAK,CAAA;oBACzB,MAAK;gBACP,KAAK,QAAQ,CAAC,KAAK;oBACjB,SAAS,GAAG,OAAO,CAAC,KAAK,CAAA;oBACzB,MAAK;gBACP,KAAK,QAAQ,CAAC,IAAI;oBAChB,SAAS,GAAG,OAAO,CAAC,IAAI,CAAA;oBACxB,MAAK;gBACP,KAAK,QAAQ,CAAC,OAAO;oBACnB,SAAS,GAAG,OAAO,CAAC,IAAI,CAAA;oBACxB,MAAK;gBACP,KAAK,QAAQ,CAAC,KAAK;oBACjB,SAAS,GAAG,OAAO,CAAC,KAAK,CAAA;oBACzB,MAAK;YACT,CAAC;YACD,IAAI,IAAI,EAAE,CAAC;gBACT,SAAS,CAAC,KAAK,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;YACjC,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,KAAK,CAAC,CAAA;YAClB,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;gBAC9C,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE;gBACtB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC;gBACzB,KAAK;gBACL,IAAI,EAAE,gBAAgB,CAAC,OAAO;gBAC9B,cAAc,EAAE,OAAO;aACC,CAAC,CAAA;QAC7B,CAAC;IACH,CAAC;IAED,GAAG,CAAC,KAAU,EAAE,GAAG,IAAW;QAC5B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAA;IAC5D,CAAC;CACF;AApHD,oCAoHC;AAED,MAAa,kBAAmB,SAAQ,YAAY;IAClD,YAAY,IAAuB;QACjC,KAAK,CAAC,IAAI,CAAC,CAAA;IACb,CAAC;CACF;AAJD,gDAIC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sphereon/ssi-types",
|
|
3
3
|
"description": "SSI Common Types",
|
|
4
|
-
"version": "0.28.
|
|
4
|
+
"version": "0.28.1-next.11+f56a4863",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
7
|
"scripts": {
|
|
@@ -44,5 +44,5 @@
|
|
|
44
44
|
"Verifiable Credentials",
|
|
45
45
|
"DIDs"
|
|
46
46
|
],
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "f56a4863b2b98a5e90adcf6f896a8cef1315cdbf"
|
|
48
48
|
}
|
package/src/logging/index.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { debug } from 'debug'
|
|
2
2
|
import { EventEmitter } from 'events'
|
|
3
3
|
|
|
4
4
|
export enum LogLevel {
|
|
@@ -96,7 +96,7 @@ export type ISimpleLogger<LogType> = {
|
|
|
96
96
|
trace(value: LogType, ...args: any[]): void
|
|
97
97
|
warning(value: LogType, ...args: any[]): void
|
|
98
98
|
error(value: LogType, ...args: any[]): void
|
|
99
|
-
logl(level: LogLevel, value: LogType, ...
|
|
99
|
+
logl(level: LogLevel, value: LogType, ...argsW: any[]): void
|
|
100
100
|
}
|
|
101
101
|
|
|
102
102
|
export class SimpleLogger implements ISimpleLogger<any> {
|
|
@@ -116,28 +116,32 @@ export class SimpleLogger implements ISimpleLogger<any> {
|
|
|
116
116
|
}
|
|
117
117
|
|
|
118
118
|
trace(value: any, ...args: any[]) {
|
|
119
|
-
this.
|
|
119
|
+
this.logImpl(LogLevel.TRACE, value, ...args)
|
|
120
120
|
}
|
|
121
121
|
|
|
122
122
|
debug(value: any, ...args: any[]) {
|
|
123
|
-
this.
|
|
123
|
+
this.logImpl(LogLevel.DEBUG, value, ...args)
|
|
124
124
|
}
|
|
125
125
|
|
|
126
126
|
info(value: any, ...args: any[]) {
|
|
127
|
-
this.
|
|
127
|
+
this.logImpl(LogLevel.INFO, value, ...args)
|
|
128
128
|
}
|
|
129
129
|
|
|
130
130
|
warning(value: any, ...args: any[]) {
|
|
131
|
-
this.
|
|
131
|
+
this.logImpl(LogLevel.WARNING, value, ...args)
|
|
132
132
|
}
|
|
133
133
|
|
|
134
134
|
error(value: any, ...args: any[]) {
|
|
135
|
-
this.
|
|
135
|
+
this.logImpl(LogLevel.ERROR, value, ...args)
|
|
136
136
|
}
|
|
137
137
|
|
|
138
138
|
logl(level: LogLevel, value: any, ...args: any[]) {
|
|
139
|
+
this.logImpl(level, value, ...args)
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
private logImpl(level: LogLevel, value: any, ...args: any[]) {
|
|
139
143
|
const date = new Date().toISOString()
|
|
140
|
-
const filteredArgs = args
|
|
144
|
+
const filteredArgs = args?.filter((v) => v!!) ?? []
|
|
141
145
|
const arg = filteredArgs.length === 0 || filteredArgs[0] == undefined ? undefined : filteredArgs
|
|
142
146
|
|
|
143
147
|
function toLogValue(options: SimpleLogOptions): any {
|
|
@@ -155,33 +159,46 @@ export class SimpleLogger implements ISimpleLogger<any> {
|
|
|
155
159
|
if (arg) {
|
|
156
160
|
logArgs.push(args)
|
|
157
161
|
}
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
162
|
+
let debugPkgEnabled = this.options.methods.includes(LogMethod.DEBUG_PKG)
|
|
163
|
+
if (debugPkgEnabled) {
|
|
164
|
+
const debugPkgDebugger = debug(this._options.namespace)
|
|
165
|
+
// It was enabled at the options level in code, but could be disabled at runtime using env vars
|
|
166
|
+
debugPkgEnabled = debugPkgDebugger.enabled
|
|
167
|
+
if (debugPkgEnabled) {
|
|
168
|
+
if (arg) {
|
|
169
|
+
debugPkgDebugger(`${date}- ${value},`, ...arg)
|
|
170
|
+
} else {
|
|
171
|
+
debugPkgDebugger(`${date}- ${value}`)
|
|
172
|
+
}
|
|
163
173
|
}
|
|
164
174
|
}
|
|
165
175
|
|
|
166
|
-
|
|
176
|
+
// We do not perform console.logs in case the debug package is enabled in code and used at runtime
|
|
177
|
+
if (this.options.methods.includes(LogMethod.CONSOLE) && !debugPkgEnabled) {
|
|
167
178
|
const [value, args] = logArgs
|
|
179
|
+
let logMethod = console.info
|
|
168
180
|
switch (level) {
|
|
169
181
|
case LogLevel.TRACE:
|
|
170
|
-
console.trace
|
|
182
|
+
logMethod = console.trace
|
|
171
183
|
break
|
|
172
184
|
case LogLevel.DEBUG:
|
|
173
|
-
console.debug
|
|
185
|
+
logMethod = console.debug
|
|
174
186
|
break
|
|
175
187
|
case LogLevel.INFO:
|
|
176
|
-
console.info
|
|
188
|
+
logMethod = console.info
|
|
177
189
|
break
|
|
178
190
|
case LogLevel.WARNING:
|
|
179
|
-
console.warn
|
|
191
|
+
logMethod = console.warn
|
|
180
192
|
break
|
|
181
193
|
case LogLevel.ERROR:
|
|
182
|
-
console.error
|
|
194
|
+
logMethod = console.error
|
|
183
195
|
break
|
|
184
196
|
}
|
|
197
|
+
if (args) {
|
|
198
|
+
logMethod(value + ',', ...args)
|
|
199
|
+
} else {
|
|
200
|
+
logMethod(value)
|
|
201
|
+
}
|
|
185
202
|
}
|
|
186
203
|
|
|
187
204
|
if (this.options.methods.includes(LogMethod.EVENT)) {
|
|
@@ -195,8 +212,8 @@ export class SimpleLogger implements ISimpleLogger<any> {
|
|
|
195
212
|
}
|
|
196
213
|
}
|
|
197
214
|
|
|
198
|
-
log(value: any, args
|
|
199
|
-
this.
|
|
215
|
+
log(value: any, ...args: any[]) {
|
|
216
|
+
this.logImpl(this.options.defaultLogLevel, value, ...args)
|
|
200
217
|
}
|
|
201
218
|
}
|
|
202
219
|
|