@kwiz/common 1.0.124 → 1.0.126
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/cjs/utils/consolelogger.js +23 -14
- package/lib/cjs/utils/consolelogger.js.map +1 -1
- package/lib/esm/utils/consolelogger.js +25 -16
- package/lib/esm/utils/consolelogger.js.map +1 -1
- package/lib/types/utils/consolelogger.d.ts +7 -2
- package/package.json +1 -1
- package/src/utils/consolelogger.ts +34 -21
|
@@ -184,16 +184,13 @@ class ConsoleLogger {
|
|
|
184
184
|
groupSync(label, renderContent, options) {
|
|
185
185
|
if ((0, typecheckers_1.isNullOrEmptyString)(label))
|
|
186
186
|
label = "SyncGroup";
|
|
187
|
-
let { logMessages, start,
|
|
187
|
+
let { logMessages, start, logMessage } = this.$startGroup();
|
|
188
188
|
let result;
|
|
189
189
|
try {
|
|
190
|
-
result = renderContent(
|
|
191
|
-
logMessages.push({ message: message, seconds: (0, date_1.getSecondsElapsed)(lastMessage) });
|
|
192
|
-
lastMessage = new Date();
|
|
193
|
-
});
|
|
190
|
+
result = renderContent(logMessage);
|
|
194
191
|
}
|
|
195
192
|
catch (e) {
|
|
196
|
-
|
|
193
|
+
logMessage(`Unhandled exception: ${e}`);
|
|
197
194
|
throw this.$finishGroup(label, e, start, logMessages, options);
|
|
198
195
|
}
|
|
199
196
|
return this.$finishGroup(label, result, start, logMessages, options);
|
|
@@ -201,16 +198,13 @@ class ConsoleLogger {
|
|
|
201
198
|
async groupAsync(label, renderContent, options) {
|
|
202
199
|
if ((0, typecheckers_1.isNullOrEmptyString)(label))
|
|
203
200
|
label = "AsyncGroup";
|
|
204
|
-
let { logMessages, start,
|
|
201
|
+
let { logMessages, start, logMessage } = this.$startGroup();
|
|
205
202
|
let result;
|
|
206
203
|
try {
|
|
207
|
-
result = await renderContent(
|
|
208
|
-
logMessages.push({ message: message, seconds: (0, date_1.getSecondsElapsed)(lastMessage) });
|
|
209
|
-
lastMessage = new Date();
|
|
210
|
-
});
|
|
204
|
+
result = await renderContent(logMessage);
|
|
211
205
|
}
|
|
212
206
|
catch (e) {
|
|
213
|
-
|
|
207
|
+
logMessage(`Unhandled exception: ${e}`);
|
|
214
208
|
throw this.$finishGroup(label, e, start, logMessages, options);
|
|
215
209
|
}
|
|
216
210
|
return this.$finishGroup(label, result, start, logMessages, options);
|
|
@@ -219,7 +213,15 @@ class ConsoleLogger {
|
|
|
219
213
|
let logMessages = [];
|
|
220
214
|
let start = new Date();
|
|
221
215
|
let lastMessage = start;
|
|
222
|
-
|
|
216
|
+
let logMessage = (message) => {
|
|
217
|
+
logMessages.push({
|
|
218
|
+
message: (0, typecheckers_1.isString)(message) || (0, typecheckers_1.isNullOrUndefined)(message)
|
|
219
|
+
? message
|
|
220
|
+
: (0, objects_1.jsonClone)(message), seconds: (0, date_1.getSecondsElapsed)(lastMessage)
|
|
221
|
+
});
|
|
222
|
+
lastMessage = new Date();
|
|
223
|
+
};
|
|
224
|
+
return { logMessage, logMessages, start };
|
|
223
225
|
}
|
|
224
226
|
$finishGroup(label, result, start, logMessages, options) {
|
|
225
227
|
if (options && options.supress)
|
|
@@ -236,7 +238,14 @@ class ConsoleLogger {
|
|
|
236
238
|
else
|
|
237
239
|
return result;
|
|
238
240
|
//drop directly, without a prefix, in the group
|
|
239
|
-
logMessages.forEach(m =>
|
|
241
|
+
logMessages.forEach(m => {
|
|
242
|
+
if ((0, typecheckers_1.isString)(m.message))
|
|
243
|
+
console.debug(`(${m.seconds}s) ${m.message}`);
|
|
244
|
+
else {
|
|
245
|
+
console.debug(`(${m.seconds}s) ${m.message.label}`);
|
|
246
|
+
console.dir(m.message.value);
|
|
247
|
+
}
|
|
248
|
+
});
|
|
240
249
|
console.groupEnd();
|
|
241
250
|
return result;
|
|
242
251
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consolelogger.js","sourceRoot":"","sources":["../../../src/utils/consolelogger.ts"],"names":[],"mappings":";;;AAAA,oDAA8D;AAC9D,0CAAoD;AACpD,4CAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"consolelogger.js","sourceRoot":"","sources":["../../../src/utils/consolelogger.ts"],"names":[],"mappings":";;;AAAA,oDAA8D;AAC9D,0CAAoD;AACpD,4CAAgE;AAChE,gDAA0D;AAC1D,gDAAuD;AACvD,0DAA4H;AAG5H,MAAM,mBAAmB,GAAG,SAAS,CAAC;AACtC,MAAM,YAAY,GAAG,MAAM,CAAC;AAO5B,qCAAqC;AACrC,IAAY,WAYX;AAZD,WAAY,WAAW;IACnB,mDAAW,CAAA;IACX,+CAAS,CAAA;IACT,6CAAQ,CAAA;IACR,2CAAO,CAAA;IACP,2BAA2B;IAC3B,6CAAQ,CAAA;IACR,2BAA2B;IAC3B,+CAAS,CAAA;IACT,2BAA2B;IAC3B,+CAAS,CAAA;IACT,4CAAQ,CAAA;AACZ,CAAC,EAZW,WAAW,2BAAX,WAAW,QAYtB;AAYD,MAAa,aAAa;IAGtB,YAAsB,OAAsB;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,GAAG,CAAC,IAAY,EAAE,MAAe;QAC3C,IAAI,MAAM,GAAG,aAAa,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAE7B,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC;YAC1B,OAAO,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,YAAY,EAAE,eAAe,6BAAa,IAAI,2BAAW,EAAE,CAAC,CAAC;QAChG,CAAC;QAED,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,aAAa,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAChG,CAAC;IAEO,MAAM,CAAC,UAAU;QACrB,IAAI,MAAM,GAAkB,IAAA,mBAAS,EAAC,SAAS,EAAE;YAC7C,WAAW,EAAE,KAAK;YAClB,OAAO,EAAE,EAAE;SACd,EAAE,IAAI,CAAC,CAAC;QACT,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,MAAM,CAAC,iBAAiB;QAC5B,OAAO,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAClD,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,QAAqB;QACxC,aAAa,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzD,CAAC;IAEM,MAAM,CAAC,QAAQ;QAClB,OAAO,aAAa,CAAC,iBAAiB,EAAE,CAAC,QAAQ,EAAE,CAAC;IACxD,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,OAAe;QAC/B,aAAa,CAAC,iBAAiB,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,OAAe;QAC9B,aAAa,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAEM,MAAM,CAAC,GAAG,CAAC,OAAe;QAC7B,aAAa,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,OAAe;QAC9B,aAAa,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,OAAe;QAC/B,aAAa,CAAC,iBAAiB,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,OAAe;QAC/B,aAAa,CAAC,iBAAiB,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,MAAe;QACtC,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;QACnB,IAAI,SAAS,GAAG,IAAA,iBAAO,EAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC;cAClD,GAAG,GAAG,IAAA,iBAAO,EAAC,CAAC,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC;cAChD,GAAG,GAAG,IAAA,iBAAO,EAAC,CAAC,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC;cAChD,GAAG,GAAG,IAAA,kBAAQ,EAAC,CAAC,CAAC,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;QAE7D,OAAO,IAAI,SAAS,KAAK,MAAM,IAAI,YAAY,EAAE,CAAC;IACtD,CAAC;IACO,aAAa;QACjB,OAAO,GAAG,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC;IACvF,CAAC;IACO,MAAM,CAAC,OAAe;QAC1B,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,IAAI,OAAO,EAAE,CAAC;IAChD,CAAC;IAEM,QAAQ,CAAC,QAAqB;QACjC,IAAI,IAAA,wBAAS,EAAC,QAAQ,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,QAAQ,CAAC;QACxC,CAAC;IACL,CAAC;IAEM,QAAQ;QACX,IAAI,IAAA,wBAAS,EAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;YACnC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;;YAC/B,OAAO,IAAA,eAAO,GAAE,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;IACnE,CAAC;IAEM,UAAU,CAAC,KAAkB;QAChC,IAAI,IAAA,2BAAmB,GAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC;QACxE,IAAI,WAAW,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClC,OAAO,KAAK,IAAI,WAAW,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,OAAY;QACrB,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAEM,IAAI,CAAC,OAAe;QACvB,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAEM,GAAG,CAAC,OAAe;QACtB,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,yCAAyC;IAClC,IAAI,CAAC,OAAe;QACvB,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IACD,yCAAyC;IAClC,KAAK,CAAC,OAAe;QACxB,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IACD,yCAAyC;IAClC,KAAK,CAAC,OAAe;QACxB,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,gGAAgG;IACzF,IAAI,CAAC,KAAa;QACrB,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAU,EAAC,OAAO,CAAC,IAAI,CAAC;YAC9D,OAAO,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC;IACrE,CAAC;IACD,gGAAgG;IACzF,OAAO,CAAC,KAAa;QACxB,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAU,EAAC,OAAO,CAAC,OAAO,CAAC;YACjE,OAAO,CAAC,OAAO,CAAC,iBAAiB,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC;IACxE,CAAC;IACD,iEAAiE;IAC1D,KAAK,CAAC,IAAS,EAAE,UAAmB,EAAE,cAAwB;QACjE,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAU,EAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAClE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;QACtE,CAAC;IACL,CAAC;IACD,wDAAwD;IACjD,IAAI,CAAC,IAAS,EAAE,UAAmB,EAAE,cAAwB;QAChE,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAU,EAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAChE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;QACpE,CAAC;IACL,CAAC;IACD,0HAA0H;IACnH,GAAG,CAAC,IAAS,EAAE,UAAmB,EAAE,cAAwB;QAC/D,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAU,EAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACnE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;gBACZ,IAAI,IAAA,uBAAQ,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACzC,IAAI,CAAC;wBACD,uCAAuC;wBACvC,IAAI,GAAG,IAAI,SAAS,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;oBAC9D,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;gBACnB,CAAC;gBACD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;QACnC,CAAC;IACL,CAAC;IACD,gIAAgI;IACzH,KAAK,CAAC,aAAyB,EAAE,KAAc,EAAE,SAAmB;QACvE,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAU,EAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAA,kCAAmB,EAAC,KAAK,CAAC,EAAE,CAAC;YACjG,IAAI,SAAS,EAAE,CAAC;gBACZ,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;YACtD,CAAC;YACD,QAAQ,GAAG,IAAI,CAAC;QACpB,CAAC;QAED,IAAI,QAAQ;YAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/B,yGAAyG;QACzG,aAAa,EAAE,CAAC;QAChB,IAAI,QAAQ,EAAE,CAAC;YACX,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO,CAAC,QAAQ,EAAE,CAAC;QACvB,CAAC;IACL,CAAC;IAEM,SAAS,CAAa,KAAa,EAAE,aAAsE,EAAE,OAInH;QACG,IAAI,IAAA,kCAAmB,EAAC,KAAK,CAAC;YAAE,KAAK,GAAG,WAAW,CAAC;QACpD,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAE5D,IAAI,MAAkB,CAAC;QACvB,IAAI,CAAC;YACD,MAAM,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,UAAU,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACnE,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IACM,KAAK,CAAC,UAAU,CAAa,KAAa,EAAE,aAA+E,EAAE,OAInI;QACG,IAAI,IAAA,kCAAmB,EAAC,KAAK,CAAC;YAAE,KAAK,GAAG,YAAY,CAAC;QACrD,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAE5D,IAAI,MAAkB,CAAC;QACvB,IAAI,CAAC;YACD,MAAM,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,UAAU,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACnE,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IAEO,WAAW;QACf,IAAI,WAAW,GAAiB,EAAE,CAAC;QAEnC,IAAI,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,UAAU,GAAG,CAAC,OAAwB,EAAE,EAAE;YAC1C,WAAW,CAAC,IAAI,CAAC;gBACb,OAAO,EAAE,IAAA,uBAAQ,EAAC,OAAO,CAAC,IAAI,IAAA,gCAAiB,EAAC,OAAO,CAAC;oBACpD,CAAC,CAAC,OAAO;oBACT,CAAC,CAAC,IAAA,mBAAS,EAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAA,wBAAiB,EAAC,WAAW,CAAC;aACpE,CAAC,CAAC;YACH,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;QAC7B,CAAC,CAAC;QAEF,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC;IACO,YAAY,CAAa,KAAa,EAAE,MAAkB,EAAE,KAAW,EAAE,WAAyB,EAAE,OAI3G;QACG,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO;YAAE,OAAO,MAAM,CAAC;QAC9C,KAAK,GAAG,GAAG,KAAK,KAAK,IAAA,wBAAiB,EAAC,KAAK,CAAC,IAAI,CAAC;QAElD,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAU,EAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAA,kCAAmB,EAAC,KAAK,CAAC,EAAE,CAAC;YACjG,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBAC5B,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;YACtD,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;YAC/D,CAAC;QACL,CAAC;;YACI,OAAO,MAAM,CAAC;QAEnB,+CAA+C;QAC/C,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACpB,IAAI,IAAA,uBAAQ,EAAC,CAAC,CAAC,OAAO,CAAC;gBACnB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;iBAC7C,CAAC;gBACF,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;gBACpD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,YAAY,CAAC,KAAK,EAAE,OAAO;QAC/B,IAAI,CAAC;YACD,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzB,IAAI,cAAc,GAAG,IAAA,uBAAQ,EAAC,OAAO,CAAC,IAAI,IAAA,uBAAQ,EAAC,OAAO,CAAC,CAAC;gBAC5D,IAAI,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAC3D,QAAQ,KAAK,EAAE,CAAC;oBACZ,KAAK,WAAW,CAAC,KAAK;wBAClB,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;wBACnC,MAAM;oBACV,KAAK,WAAW,CAAC,KAAK;wBAClB,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;wBACnC,MAAM;oBACV,KAAK,WAAW,CAAC,IAAI;wBACjB,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;wBAClC,MAAM;oBACV,KAAK,WAAW,CAAC,IAAI;wBACjB,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;wBAClC,MAAM;oBACV,KAAK,WAAW,CAAC,KAAK;wBAClB,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;wBACnC,MAAM;oBACV;wBACI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;gBACzC,CAAC;YACL,CAAC;QACL,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACV,OAAO;QACX,CAAC;IACL,CAAC;CACJ;AApSD,sCAoSC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { BuildNumber, ReleaseStatus } from "../_dependencies";
|
|
2
2
|
import { getSecondsElapsed } from "../helpers/date";
|
|
3
3
|
import { consoleLoggerFilter, isDebug } from "../helpers/debug";
|
|
4
|
-
import { getGlobal } from "../helpers/objects";
|
|
4
|
+
import { getGlobal, jsonClone } from "../helpers/objects";
|
|
5
5
|
import { padLeft, padRight } from "../helpers/strings";
|
|
6
|
-
import { isFunction, isNullOrEmptyString, isNumber, isNumeric, isString } from "../helpers/typecheckers";
|
|
6
|
+
import { isFunction, isNullOrEmptyString, isNullOrUndefined, isNumber, isNumeric, isString } from "../helpers/typecheckers";
|
|
7
7
|
const DEFAULT_LOGGER_NAME = "DEFAULT";
|
|
8
8
|
const LoggerPrefix = "[kw]";
|
|
9
9
|
// eslint-disable-next-line no-shadow
|
|
@@ -181,16 +181,13 @@ export class ConsoleLogger {
|
|
|
181
181
|
groupSync(label, renderContent, options) {
|
|
182
182
|
if (isNullOrEmptyString(label))
|
|
183
183
|
label = "SyncGroup";
|
|
184
|
-
let { logMessages, start,
|
|
184
|
+
let { logMessages, start, logMessage } = this.$startGroup();
|
|
185
185
|
let result;
|
|
186
186
|
try {
|
|
187
|
-
result = renderContent(
|
|
188
|
-
logMessages.push({ message: message, seconds: getSecondsElapsed(lastMessage) });
|
|
189
|
-
lastMessage = new Date();
|
|
190
|
-
});
|
|
187
|
+
result = renderContent(logMessage);
|
|
191
188
|
}
|
|
192
189
|
catch (e) {
|
|
193
|
-
|
|
190
|
+
logMessage(`Unhandled exception: ${e}`);
|
|
194
191
|
throw this.$finishGroup(label, e, start, logMessages, options);
|
|
195
192
|
}
|
|
196
193
|
return this.$finishGroup(label, result, start, logMessages, options);
|
|
@@ -198,16 +195,13 @@ export class ConsoleLogger {
|
|
|
198
195
|
async groupAsync(label, renderContent, options) {
|
|
199
196
|
if (isNullOrEmptyString(label))
|
|
200
197
|
label = "AsyncGroup";
|
|
201
|
-
let { logMessages, start,
|
|
198
|
+
let { logMessages, start, logMessage } = this.$startGroup();
|
|
202
199
|
let result;
|
|
203
200
|
try {
|
|
204
|
-
result = await renderContent(
|
|
205
|
-
logMessages.push({ message: message, seconds: getSecondsElapsed(lastMessage) });
|
|
206
|
-
lastMessage = new Date();
|
|
207
|
-
});
|
|
201
|
+
result = await renderContent(logMessage);
|
|
208
202
|
}
|
|
209
203
|
catch (e) {
|
|
210
|
-
|
|
204
|
+
logMessage(`Unhandled exception: ${e}`);
|
|
211
205
|
throw this.$finishGroup(label, e, start, logMessages, options);
|
|
212
206
|
}
|
|
213
207
|
return this.$finishGroup(label, result, start, logMessages, options);
|
|
@@ -216,7 +210,15 @@ export class ConsoleLogger {
|
|
|
216
210
|
let logMessages = [];
|
|
217
211
|
let start = new Date();
|
|
218
212
|
let lastMessage = start;
|
|
219
|
-
|
|
213
|
+
let logMessage = (message) => {
|
|
214
|
+
logMessages.push({
|
|
215
|
+
message: isString(message) || isNullOrUndefined(message)
|
|
216
|
+
? message
|
|
217
|
+
: jsonClone(message), seconds: getSecondsElapsed(lastMessage)
|
|
218
|
+
});
|
|
219
|
+
lastMessage = new Date();
|
|
220
|
+
};
|
|
221
|
+
return { logMessage, logMessages, start };
|
|
220
222
|
}
|
|
221
223
|
$finishGroup(label, result, start, logMessages, options) {
|
|
222
224
|
if (options && options.supress)
|
|
@@ -233,7 +235,14 @@ export class ConsoleLogger {
|
|
|
233
235
|
else
|
|
234
236
|
return result;
|
|
235
237
|
//drop directly, without a prefix, in the group
|
|
236
|
-
logMessages.forEach(m =>
|
|
238
|
+
logMessages.forEach(m => {
|
|
239
|
+
if (isString(m.message))
|
|
240
|
+
console.debug(`(${m.seconds}s) ${m.message}`);
|
|
241
|
+
else {
|
|
242
|
+
console.debug(`(${m.seconds}s) ${m.message.label}`);
|
|
243
|
+
console.dir(m.message.value);
|
|
244
|
+
}
|
|
245
|
+
});
|
|
237
246
|
console.groupEnd();
|
|
238
247
|
return result;
|
|
239
248
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consolelogger.js","sourceRoot":"","sources":["../../../src/utils/consolelogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"consolelogger.js","sourceRoot":"","sources":["../../../src/utils/consolelogger.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,10 @@ export type LoggerContext = {
|
|
|
16
16
|
name?: string;
|
|
17
17
|
prefix?: string;
|
|
18
18
|
};
|
|
19
|
+
type logMessageValue = string | {
|
|
20
|
+
label: string;
|
|
21
|
+
value: Object;
|
|
22
|
+
};
|
|
19
23
|
export declare class ConsoleLogger {
|
|
20
24
|
context: LoggerContext;
|
|
21
25
|
protected constructor(context: LoggerContext);
|
|
@@ -57,12 +61,12 @@ export declare class ConsoleLogger {
|
|
|
57
61
|
xml(data: any, groupLabel?: string, groupCollapsed?: boolean): void;
|
|
58
62
|
/** render messages inside a group, and closes the group when done. if a label is not provided - a group will not be rendered */
|
|
59
63
|
group(renderContent: () => void, label?: string, collapsed?: boolean): void;
|
|
60
|
-
groupSync<ReturnType>(label: string, renderContent: (log: (message:
|
|
64
|
+
groupSync<ReturnType>(label: string, renderContent: (log: (message: logMessageValue) => void) => ReturnType, options?: {
|
|
61
65
|
expand?: boolean;
|
|
62
66
|
/** do not write to log */
|
|
63
67
|
supress?: boolean;
|
|
64
68
|
}): ReturnType;
|
|
65
|
-
groupAsync<ReturnType>(label: string, renderContent: (log: (message:
|
|
69
|
+
groupAsync<ReturnType>(label: string, renderContent: (log: (message: logMessageValue) => void) => Promise<ReturnType>, options?: {
|
|
66
70
|
expand?: boolean;
|
|
67
71
|
/** do not write to log */
|
|
68
72
|
supress?: boolean;
|
|
@@ -71,3 +75,4 @@ export declare class ConsoleLogger {
|
|
|
71
75
|
private $finishGroup;
|
|
72
76
|
private logWithLevel;
|
|
73
77
|
}
|
|
78
|
+
export {};
|
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { BuildNumber, ReleaseStatus } from "../_dependencies";
|
|
2
2
|
import { getSecondsElapsed } from "../helpers/date";
|
|
3
3
|
import { consoleLoggerFilter, isDebug } from "../helpers/debug";
|
|
4
|
-
import { getGlobal } from "../helpers/objects";
|
|
4
|
+
import { getGlobal, jsonClone } from "../helpers/objects";
|
|
5
5
|
import { padLeft, padRight } from "../helpers/strings";
|
|
6
|
-
import { isFunction, isNullOrEmptyString, isNumber, isNumeric, isString } from "../helpers/typecheckers";
|
|
6
|
+
import { isFunction, isNullOrEmptyString, isNullOrUndefined, isNumber, isNumeric, isString } from "../helpers/typecheckers";
|
|
7
7
|
import { IDictionary } from "../types/common.types";
|
|
8
8
|
|
|
9
9
|
const DEFAULT_LOGGER_NAME = "DEFAULT";
|
|
@@ -37,6 +37,8 @@ export type LoggerContext = {
|
|
|
37
37
|
prefix?: string;
|
|
38
38
|
};
|
|
39
39
|
|
|
40
|
+
type logMessageValue = string | { label: string, value: Object };
|
|
41
|
+
type logMessage = { seconds: number, message: logMessageValue };
|
|
40
42
|
export class ConsoleLogger {
|
|
41
43
|
public context: LoggerContext;
|
|
42
44
|
|
|
@@ -53,7 +55,7 @@ export class ConsoleLogger {
|
|
|
53
55
|
console.debug(`${ConsoleLogger.commonPrefix()} KWIZ build ${ReleaseStatus}.${BuildNumber}`);
|
|
54
56
|
}
|
|
55
57
|
|
|
56
|
-
return loggers[name] || (loggers[name] = new ConsoleLogger({ name: name, prefix:prefix }));
|
|
58
|
+
return loggers[name] || (loggers[name] = new ConsoleLogger({ name: name, prefix: prefix }));
|
|
57
59
|
}
|
|
58
60
|
|
|
59
61
|
private static _getGlobal() {
|
|
@@ -216,43 +218,37 @@ export class ConsoleLogger {
|
|
|
216
218
|
}
|
|
217
219
|
}
|
|
218
220
|
|
|
219
|
-
public groupSync<ReturnType>(label: string, renderContent: (log: (message:
|
|
221
|
+
public groupSync<ReturnType>(label: string, renderContent: (log: (message: logMessageValue) => void) => ReturnType, options?: {
|
|
220
222
|
expand?: boolean;
|
|
221
223
|
/** do not write to log */
|
|
222
224
|
supress?: boolean;
|
|
223
225
|
}) {
|
|
224
226
|
if (isNullOrEmptyString(label)) label = "SyncGroup";
|
|
225
|
-
let { logMessages, start,
|
|
227
|
+
let { logMessages, start, logMessage } = this.$startGroup();
|
|
226
228
|
|
|
227
229
|
let result: ReturnType;
|
|
228
230
|
try {
|
|
229
|
-
result = renderContent(
|
|
230
|
-
logMessages.push({ message: message, seconds: getSecondsElapsed(lastMessage) });
|
|
231
|
-
lastMessage = new Date();
|
|
232
|
-
});
|
|
231
|
+
result = renderContent(logMessage);
|
|
233
232
|
} catch (e) {
|
|
234
|
-
|
|
233
|
+
logMessage(`Unhandled exception: ${e}`);
|
|
235
234
|
throw this.$finishGroup(label, e, start, logMessages, options);
|
|
236
235
|
}
|
|
237
236
|
|
|
238
237
|
return this.$finishGroup(label, result, start, logMessages, options);
|
|
239
238
|
}
|
|
240
|
-
public async groupAsync<ReturnType>(label: string, renderContent: (log: (message:
|
|
239
|
+
public async groupAsync<ReturnType>(label: string, renderContent: (log: (message: logMessageValue) => void) => Promise<ReturnType>, options?: {
|
|
241
240
|
expand?: boolean;
|
|
242
241
|
/** do not write to log */
|
|
243
242
|
supress?: boolean;
|
|
244
243
|
}) {
|
|
245
244
|
if (isNullOrEmptyString(label)) label = "AsyncGroup";
|
|
246
|
-
let { logMessages, start,
|
|
245
|
+
let { logMessages, start, logMessage } = this.$startGroup();
|
|
247
246
|
|
|
248
247
|
let result: ReturnType;
|
|
249
248
|
try {
|
|
250
|
-
result = await renderContent(
|
|
251
|
-
logMessages.push({ message: message, seconds: getSecondsElapsed(lastMessage) });
|
|
252
|
-
lastMessage = new Date();
|
|
253
|
-
});
|
|
249
|
+
result = await renderContent(logMessage);
|
|
254
250
|
} catch (e) {
|
|
255
|
-
|
|
251
|
+
logMessage(`Unhandled exception: ${e}`);
|
|
256
252
|
throw this.$finishGroup(label, e, start, logMessages, options);
|
|
257
253
|
}
|
|
258
254
|
|
|
@@ -260,13 +256,23 @@ export class ConsoleLogger {
|
|
|
260
256
|
}
|
|
261
257
|
|
|
262
258
|
private $startGroup() {
|
|
263
|
-
let logMessages:
|
|
259
|
+
let logMessages: logMessage[] = [];
|
|
264
260
|
|
|
265
261
|
let start = new Date();
|
|
266
262
|
let lastMessage = start;
|
|
267
|
-
|
|
263
|
+
|
|
264
|
+
let logMessage = (message: logMessageValue) => {
|
|
265
|
+
logMessages.push({
|
|
266
|
+
message: isString(message) || isNullOrUndefined(message)
|
|
267
|
+
? message
|
|
268
|
+
: jsonClone(message), seconds: getSecondsElapsed(lastMessage)
|
|
269
|
+
});
|
|
270
|
+
lastMessage = new Date();
|
|
271
|
+
};
|
|
272
|
+
|
|
273
|
+
return { logMessage, logMessages, start };
|
|
268
274
|
}
|
|
269
|
-
private $finishGroup<ReturnType>(label: string, result: ReturnType, start: Date, logMessages:
|
|
275
|
+
private $finishGroup<ReturnType>(label: string, result: ReturnType, start: Date, logMessages: logMessage[], options?: {
|
|
270
276
|
expand?: boolean;
|
|
271
277
|
/** do not write to log */
|
|
272
278
|
supress?: boolean;
|
|
@@ -284,7 +290,14 @@ export class ConsoleLogger {
|
|
|
284
290
|
else return result;
|
|
285
291
|
|
|
286
292
|
//drop directly, without a prefix, in the group
|
|
287
|
-
logMessages.forEach(m =>
|
|
293
|
+
logMessages.forEach(m => {
|
|
294
|
+
if (isString(m.message))
|
|
295
|
+
console.debug(`(${m.seconds}s) ${m.message}`);
|
|
296
|
+
else {
|
|
297
|
+
console.debug(`(${m.seconds}s) ${m.message.label}`);
|
|
298
|
+
console.dir(m.message.value);
|
|
299
|
+
}
|
|
300
|
+
});
|
|
288
301
|
console.groupEnd();
|
|
289
302
|
return result;
|
|
290
303
|
}
|