@zajno/common 2.7.0 → 2.7.2
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/cjs/api/call.js +5 -5
- package/cjs/api/call.js.map +1 -1
- package/cjs/api/config.js +30 -5
- package/cjs/api/config.js.map +1 -1
- package/cjs/api/index.js +5 -6
- package/cjs/api/index.js.map +1 -1
- package/cjs/api/interceptor.js +1 -1
- package/cjs/api/logging.js +3 -3
- package/cjs/api/logging.js.map +1 -1
- package/cjs/functions/assert.js +2 -4
- package/cjs/functions/assert.js.map +1 -1
- package/cjs/functions/disposer.js +10 -18
- package/cjs/functions/disposer.js.map +1 -1
- package/cjs/functions/throttle.js +8 -17
- package/cjs/functions/throttle.js.map +1 -1
- package/cjs/logger/batch.js +23 -3
- package/cjs/logger/batch.js.map +1 -1
- package/cjs/logger/buffered/base.js +52 -0
- package/cjs/logger/buffered/base.js.map +1 -0
- package/cjs/logger/buffered/buffered.logger.js +40 -0
- package/cjs/logger/buffered/buffered.logger.js.map +1 -0
- package/cjs/logger/buffered/buffered.memory.js +71 -0
- package/cjs/logger/buffered/buffered.memory.js.map +1 -0
- package/cjs/logger/buffered/file/buffered.file.js +43 -0
- package/cjs/logger/buffered/file/buffered.file.js.map +1 -0
- package/cjs/logger/buffered/file/index.js +5 -0
- package/cjs/logger/buffered/file/index.js.map +1 -0
- package/cjs/logger/buffered/index.js +7 -0
- package/cjs/logger/buffered/index.js.map +1 -0
- package/cjs/logger/console.js +1 -39
- package/cjs/logger/console.js.map +1 -1
- package/cjs/logger/empty.js +11 -0
- package/cjs/logger/empty.js.map +1 -0
- package/cjs/logger/index.js +5 -7
- package/cjs/logger/index.js.map +1 -1
- package/cjs/logger/loggable.js +39 -0
- package/cjs/logger/loggable.js.map +1 -0
- package/cjs/logger/manager.js +70 -20
- package/cjs/logger/manager.js.map +1 -1
- package/cjs/logger/named.js +15 -12
- package/cjs/logger/named.js.map +1 -1
- package/cjs/logger/provider.js +33 -0
- package/cjs/logger/provider.js.map +1 -0
- package/cjs/logger/proxy.js +3 -7
- package/cjs/logger/proxy.js.map +1 -1
- package/cjs/logger/types.js +9 -0
- package/cjs/logger/types.js.map +1 -0
- package/cjs/models/LogicModel.js +13 -11
- package/cjs/models/LogicModel.js.map +1 -1
- package/cjs/observing/event.js +5 -18
- package/cjs/observing/event.js.map +1 -1
- package/cjs/observing/progressTracker.js +8 -15
- package/cjs/observing/progressTracker.js.map +1 -1
- package/cjs/structures/promiseCache.js +14 -20
- package/cjs/structures/promiseCache.js.map +1 -1
- package/cjs/structures/queue/parallel.js +11 -13
- package/cjs/structures/queue/parallel.js.map +1 -1
- package/cjs/structures/subscribersMap.js +9 -7
- package/cjs/structures/subscribersMap.js.map +1 -1
- package/esm/api/call.js +5 -5
- package/esm/api/call.js.map +1 -1
- package/esm/api/config.js +28 -4
- package/esm/api/config.js.map +1 -1
- package/esm/api/index.js +4 -2
- package/esm/api/index.js.map +1 -1
- package/esm/api/interceptor.js +1 -1
- package/esm/api/logging.js +3 -3
- package/esm/api/logging.js.map +1 -1
- package/esm/functions/assert.js +2 -3
- package/esm/functions/assert.js.map +1 -1
- package/esm/functions/disposer.js +10 -17
- package/esm/functions/disposer.js.map +1 -1
- package/esm/functions/throttle.js +6 -15
- package/esm/functions/throttle.js.map +1 -1
- package/esm/logger/batch.js +23 -3
- package/esm/logger/batch.js.map +1 -1
- package/esm/logger/buffered/base.js +48 -0
- package/esm/logger/buffered/base.js.map +1 -0
- package/esm/logger/buffered/buffered.logger.js +36 -0
- package/esm/logger/buffered/buffered.logger.js.map +1 -0
- package/esm/logger/buffered/buffered.memory.js +67 -0
- package/esm/logger/buffered/buffered.memory.js.map +1 -0
- package/esm/logger/buffered/file/buffered.file.js +38 -0
- package/esm/logger/buffered/file/buffered.file.js.map +1 -0
- package/esm/logger/buffered/file/index.js +2 -0
- package/esm/logger/buffered/file/index.js.map +1 -0
- package/esm/logger/buffered/index.js +4 -0
- package/esm/logger/buffered/index.js.map +1 -0
- package/esm/logger/console.js +0 -37
- package/esm/logger/console.js.map +1 -1
- package/esm/logger/empty.js +7 -0
- package/esm/logger/empty.js.map +1 -0
- package/esm/logger/index.js +3 -7
- package/esm/logger/index.js.map +1 -1
- package/esm/logger/loggable.js +35 -0
- package/esm/logger/loggable.js.map +1 -0
- package/esm/logger/manager.js +70 -20
- package/esm/logger/manager.js.map +1 -1
- package/esm/logger/named.js +8 -4
- package/esm/logger/named.js.map +1 -1
- package/esm/logger/provider.js +29 -0
- package/esm/logger/provider.js.map +1 -0
- package/esm/logger/proxy.js +2 -6
- package/esm/logger/proxy.js.map +1 -1
- package/esm/logger/types.js +6 -0
- package/esm/logger/types.js.map +1 -0
- package/esm/models/LogicModel.js +13 -11
- package/esm/models/LogicModel.js.map +1 -1
- package/esm/observing/event.js +5 -18
- package/esm/observing/event.js.map +1 -1
- package/esm/observing/progressTracker.js +8 -14
- package/esm/observing/progressTracker.js.map +1 -1
- package/esm/structures/promiseCache.js +14 -20
- package/esm/structures/promiseCache.js.map +1 -1
- package/esm/structures/queue/parallel.js +11 -13
- package/esm/structures/queue/parallel.js.map +1 -1
- package/esm/structures/subscribersMap.js +9 -7
- package/esm/structures/subscribersMap.js.map +1 -1
- package/package.json +13 -1
- package/tsconfig.cjs.tsbuildinfo +1 -1
- package/tsconfig.esm.tsbuildinfo +1 -1
- package/tsconfig.types.tsbuildinfo +1 -1
- package/types/api/call.types.d.ts +2 -2
- package/types/api/config.d.ts +11 -4
- package/types/api/extensions/endpointHooks.d.ts +1 -1
- package/types/api/index.d.ts +4 -2
- package/types/api/interceptor.d.ts +1 -1
- package/types/api/logging.d.ts +8 -6
- package/types/functions/assert.d.ts +3 -3
- package/types/functions/disposer.d.ts +7 -6
- package/types/functions/throttle.d.ts +4 -5
- package/types/logger/batch.d.ts +3 -2
- package/types/logger/buffered/base.d.ts +23 -0
- package/types/logger/buffered/buffered.logger.d.ts +8 -0
- package/types/logger/buffered/buffered.memory.d.ts +19 -0
- package/types/logger/buffered/file/buffered.file.d.ts +9 -0
- package/types/logger/buffered/file/index.d.ts +1 -0
- package/types/logger/buffered/index.d.ts +3 -0
- package/types/logger/console.d.ts +1 -13
- package/types/logger/empty.d.ts +3 -0
- package/types/logger/index.d.ts +6 -10
- package/types/logger/loggable.d.ts +13 -0
- package/types/logger/manager.d.ts +31 -7
- package/types/logger/named.d.ts +4 -3
- package/types/logger/provider.d.ts +11 -0
- package/types/logger/proxy.d.ts +1 -2
- package/types/logger/types.d.ts +21 -0
- package/types/models/LogicModel.d.ts +4 -4
- package/types/observing/event.d.ts +3 -6
- package/types/observing/progressTracker.d.ts +3 -4
- package/types/structures/promiseCache.d.ts +3 -4
- package/types/structures/queue/parallel.d.ts +3 -3
- package/types/structures/subscribersMap.d.ts +3 -2
- package/cjs/logger/abstractions.js +0 -3
- package/cjs/logger/abstractions.js.map +0 -1
- package/cjs/logger/file.js +0 -65
- package/cjs/logger/file.js.map +0 -1
- package/cjs/logger/shared.js +0 -18
- package/cjs/logger/shared.js.map +0 -1
- package/esm/logger/abstractions.js +0 -2
- package/esm/logger/abstractions.js.map +0 -1
- package/esm/logger/file.js +0 -60
- package/esm/logger/file.js.map +0 -1
- package/esm/logger/shared.js +0 -15
- package/esm/logger/shared.js.map +0 -1
- package/types/logger/abstractions.d.ts +0 -10
- package/types/logger/file.d.ts +0 -15
- package/types/logger/shared.d.ts +0 -15
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.FileLoggerNode = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
/* eslint-disable no-console */
|
|
6
|
+
const Path = tslib_1.__importStar(require("node:path"));
|
|
7
|
+
const FS = tslib_1.__importStar(require("node:fs"));
|
|
8
|
+
const Util = tslib_1.__importStar(require("node:util"));
|
|
9
|
+
const buffered_memory_js_1 = require("../buffered.memory.js");
|
|
10
|
+
class FileLoggerNode extends buffered_memory_js_1.BufferedMemoryLogger {
|
|
11
|
+
_logFilePath = null;
|
|
12
|
+
setLogFilePath(path) {
|
|
13
|
+
this._logFilePath = path;
|
|
14
|
+
return this;
|
|
15
|
+
}
|
|
16
|
+
setLogName(name) {
|
|
17
|
+
const n = name ? `-${name}` : '';
|
|
18
|
+
this._logFilePath = Path.resolve(process.cwd(), `run${n}.${new Date().toISOString()}.log`);
|
|
19
|
+
return this;
|
|
20
|
+
}
|
|
21
|
+
formatLine(line) {
|
|
22
|
+
return Util.format.apply(null, line);
|
|
23
|
+
}
|
|
24
|
+
onFlushed() {
|
|
25
|
+
super.onFlushed();
|
|
26
|
+
// should transfer the internal buffer to the memory, formatted
|
|
27
|
+
// copy and clear the memory
|
|
28
|
+
const memory = this.getMemory(true);
|
|
29
|
+
try {
|
|
30
|
+
if (this._logFilePath) {
|
|
31
|
+
this.appendToFileSync(this._logFilePath, memory.join(''));
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
catch (err) {
|
|
35
|
+
console.warn('Failed to flush file, error', err);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
appendToFileSync(path, data) {
|
|
39
|
+
FS.appendFileSync(path, data);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
exports.FileLoggerNode = FileLoggerNode;
|
|
43
|
+
//# sourceMappingURL=buffered.file.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buffered.file.js","sourceRoot":"","sources":["../../../../../src/logger/buffered/file/buffered.file.ts"],"names":[],"mappings":";;;;AACA,+BAA+B;AAC/B,wDAAkC;AAClC,oDAA8B;AAC9B,wDAAkC;AAElC,8DAA6D;AAE7D,MAAa,cAAe,SAAQ,yCAAoB;IAC5C,YAAY,GAAkB,IAAI,CAAC;IAE3C,cAAc,CAAC,IAAY;QACvB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,IAAY;QACnB,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC3F,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,UAAU,CAAC,IAAW;QAC5B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IAES,SAAS;QACf,KAAK,CAAC,SAAS,EAAE,CAAC;QAElB,+DAA+D;QAC/D,4BAA4B;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,CAAC;YACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAC9D,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;QACrD,CAAC;IACL,CAAC;IAES,gBAAgB,CAAC,IAAY,EAAE,IAAY;QACjD,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;CACJ;AArCD,wCAqCC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/logger/buffered/file/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
tslib_1.__exportStar(require("./base.js"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./buffered.logger.js"), exports);
|
|
6
|
+
tslib_1.__exportStar(require("./buffered.memory.js"), exports);
|
|
7
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/logger/buffered/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,+DAAqC;AACrC,+DAAqC"}
|
package/cjs/logger/console.js
CHANGED
|
@@ -1,48 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.ConsoleLogger = exports.CONSOLE = void 0;
|
|
4
4
|
const named_js_1 = require("./named.js");
|
|
5
5
|
exports.CONSOLE = console;
|
|
6
6
|
class ConsoleLogger extends named_js_1.NamedLogger {
|
|
7
7
|
get implementation() { return exports.CONSOLE; }
|
|
8
8
|
}
|
|
9
9
|
exports.ConsoleLogger = ConsoleLogger;
|
|
10
|
-
class BufferedConsoleLogger {
|
|
11
|
-
_name;
|
|
12
|
-
_logs = [];
|
|
13
|
-
_level = 1;
|
|
14
|
-
_log = exports.CONSOLE.log;
|
|
15
|
-
constructor(name) {
|
|
16
|
-
this._name = name || '';
|
|
17
|
-
}
|
|
18
|
-
log(...args) {
|
|
19
|
-
this._logs.push('\t--->', ...args);
|
|
20
|
-
}
|
|
21
|
-
warn(...args) {
|
|
22
|
-
this._logs.push('\t---> [WARN]', ...args);
|
|
23
|
-
this._raiseLevel(2);
|
|
24
|
-
}
|
|
25
|
-
error(...args) {
|
|
26
|
-
this._logs.push('\t---> [ERROR]', ...args);
|
|
27
|
-
this._raiseLevel(3);
|
|
28
|
-
}
|
|
29
|
-
flush() {
|
|
30
|
-
if (this._logs.length > 0) {
|
|
31
|
-
this._log(this._name, ...this._logs);
|
|
32
|
-
this._logs.length = 0;
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
_raiseLevel(l) {
|
|
36
|
-
if (l > this._level) {
|
|
37
|
-
this._level = l;
|
|
38
|
-
if (l >= 3) {
|
|
39
|
-
this._log = exports.CONSOLE.error;
|
|
40
|
-
}
|
|
41
|
-
else if (l >= 2) {
|
|
42
|
-
this._log = exports.CONSOLE.warn;
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
exports.BufferedConsoleLogger = BufferedConsoleLogger;
|
|
48
10
|
//# sourceMappingURL=console.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../src/logger/console.ts"],"names":[],"mappings":";;;AACA,yCAAyC;AAE5B,QAAA,OAAO,GAAY,OAAO,CAAC;AAExC,MAAa,aAAc,SAAQ,sBAAW;IAC1C,IAAc,cAAc,KAAK,OAAO,eAAO,CAAC,CAAC,CAAC;CACrD;AAFD,sCAEC
|
|
1
|
+
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../src/logger/console.ts"],"names":[],"mappings":";;;AACA,yCAAyC;AAE5B,QAAA,OAAO,GAAY,OAAO,CAAC;AAExC,MAAa,aAAc,SAAQ,sBAAW;IAC1C,IAAc,cAAc,KAAK,OAAO,eAAO,CAAC,CAAC,CAAC;CACrD;AAFD,sCAEC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.EMPTY_LOGGER = exports.EMPTY_FUNCTION = void 0;
|
|
4
|
+
const EMPTY_FUNCTION = () => { };
|
|
5
|
+
exports.EMPTY_FUNCTION = EMPTY_FUNCTION;
|
|
6
|
+
exports.EMPTY_LOGGER = {
|
|
7
|
+
log: exports.EMPTY_FUNCTION,
|
|
8
|
+
warn: exports.EMPTY_FUNCTION,
|
|
9
|
+
error: exports.EMPTY_FUNCTION,
|
|
10
|
+
};
|
|
11
|
+
//# sourceMappingURL=empty.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"empty.js","sourceRoot":"","sources":["../../../src/logger/empty.ts"],"names":[],"mappings":";;;AAEO,MAAM,cAAc,GAAmB,GAAG,EAAE,GAAe,CAAC,CAAC;AAAvD,QAAA,cAAc,kBAAyC;AAEvD,QAAA,YAAY,GAAY;IACjC,GAAG,EAAE,sBAAc;IACnB,IAAI,EAAE,sBAAc;IACpB,KAAK,EAAE,sBAAc;CACxB,CAAC"}
|
package/cjs/logger/index.js
CHANGED
|
@@ -1,18 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
3
|
+
exports.LoggerProvider = exports.Loggable = exports.LoggersManager = exports.batchLoggers = exports.ConsoleLogger = exports.NamedLogger = void 0;
|
|
5
4
|
const console_js_1 = require("./console.js");
|
|
6
5
|
Object.defineProperty(exports, "ConsoleLogger", { enumerable: true, get: function () { return console_js_1.ConsoleLogger; } });
|
|
7
6
|
const batch_js_1 = require("./batch.js");
|
|
8
7
|
Object.defineProperty(exports, "batchLoggers", { enumerable: true, get: function () { return batch_js_1.batchLoggers; } });
|
|
9
8
|
const manager_js_1 = require("./manager.js");
|
|
10
9
|
Object.defineProperty(exports, "LoggersManager", { enumerable: true, get: function () { return manager_js_1.LoggersManager; } });
|
|
10
|
+
const loggable_js_1 = require("./loggable.js");
|
|
11
|
+
Object.defineProperty(exports, "Loggable", { enumerable: true, get: function () { return loggable_js_1.Loggable; } });
|
|
12
|
+
const provider_js_1 = require("./provider.js");
|
|
13
|
+
Object.defineProperty(exports, "LoggerProvider", { enumerable: true, get: function () { return provider_js_1.LoggerProvider; } });
|
|
11
14
|
var named_js_1 = require("./named.js");
|
|
12
15
|
Object.defineProperty(exports, "NamedLogger", { enumerable: true, get: function () { return named_js_1.NamedLogger; } });
|
|
13
|
-
/** Shared logger instance used internally in this library.
|
|
14
|
-
*
|
|
15
|
-
* For internal default loggers to be enabled and working, don't forget to set the mode to this instance.
|
|
16
|
-
*/
|
|
17
|
-
exports.SharedLogger = tslib_1.__importStar(require("./shared.js"));
|
|
18
16
|
//# sourceMappingURL=index.js.map
|
package/cjs/logger/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/logger/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/logger/index.ts"],"names":[],"mappings":";;;AACA,6CAA6C;AASzC,8FATK,0BAAa,OASL;AARjB,yCAA0C;AAStC,6FATK,uBAAY,OASL;AARhB,6CAA8C;AAS1C,+FATK,2BAAc,OASL;AARlB,+CAAyC;AASrC,yFATK,sBAAQ,OASL;AARZ,+CAA+C;AAS3C,+FATK,4BAAc,OASL;AANlB,uCAAyC;AAAhC,uGAAA,WAAW,OAAA"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Loggable = void 0;
|
|
4
|
+
const getter_js_1 = require("../types/getter.js");
|
|
5
|
+
/** Helper base class for storing and using a logger instance. */
|
|
6
|
+
class Loggable {
|
|
7
|
+
_logger = null;
|
|
8
|
+
constructor(logger) {
|
|
9
|
+
if (logger) {
|
|
10
|
+
this.setLogger(logger);
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
get logger() { return this._logger; }
|
|
14
|
+
setLogger(logger) {
|
|
15
|
+
if (!logger) {
|
|
16
|
+
this._logger = null;
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
this._logger = getter_js_1.Getter.toValue(logger) ?? null;
|
|
20
|
+
}
|
|
21
|
+
return this;
|
|
22
|
+
}
|
|
23
|
+
setLoggerFactory(factory, ...args) {
|
|
24
|
+
if (!factory) {
|
|
25
|
+
return this.setLogger(null);
|
|
26
|
+
}
|
|
27
|
+
const res = this._createLogger(factory, ...args);
|
|
28
|
+
return this.setLogger(res);
|
|
29
|
+
}
|
|
30
|
+
getLoggerName(name) {
|
|
31
|
+
return name ? `[${name}]` : '';
|
|
32
|
+
}
|
|
33
|
+
_createLogger(factory, ...args) {
|
|
34
|
+
const [originalName, ...rest] = args;
|
|
35
|
+
return factory(this.getLoggerName(originalName), ...rest);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
exports.Loggable = Loggable;
|
|
39
|
+
//# sourceMappingURL=loggable.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loggable.js","sourceRoot":"","sources":["../../../src/logger/loggable.ts"],"names":[],"mappings":";;;AAAA,kDAA4C;AAI5C,iEAAiE;AACjE,MAAa,QAAQ;IAET,OAAO,GAAmB,IAAI,CAAC;IAEvC,YAAY,MAAgB;QACxB,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;IACL,CAAC;IAED,IAAc,MAAM,KAAK,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAExC,SAAS,CAAC,MAAkC;QAC/C,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACxB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,GAAG,kBAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;QAClD,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,gBAAgB,CAAC,OAA8B,EAAE,GAAG,IAAgC;QACvF,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAES,aAAa,CAAC,IAAwB;QAC5C,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACnC,CAAC;IAES,aAAa,CAAC,OAAuB,EAAE,GAAG,IAAgC;QAChF,MAAM,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;QACrC,OAAO,OAAO,CACV,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,EAChC,GAAG,IAAI,CACV,CAAC;IACN,CAAC;CACJ;AA1CD,4BA0CC"}
|
package/cjs/logger/manager.js
CHANGED
|
@@ -4,46 +4,72 @@ exports.LoggersManager = void 0;
|
|
|
4
4
|
const getter_js_1 = require("../types/getter.js");
|
|
5
5
|
const console_js_1 = require("./console.js");
|
|
6
6
|
const proxy_js_1 = require("./proxy.js");
|
|
7
|
+
const batch_js_1 = require("./batch.js");
|
|
7
8
|
class LoggersManager {
|
|
9
|
+
/** Storage for instances created by this manager */
|
|
8
10
|
_managed = new Set();
|
|
11
|
+
/** Storage for all attached instances. */
|
|
9
12
|
_all = new Set();
|
|
13
|
+
/** Current main mode. */
|
|
10
14
|
_mode = false;
|
|
15
|
+
/** Additionally attached logger destinations (e.g. for analytics) */
|
|
16
|
+
_destinations = [];
|
|
11
17
|
get mode() { return this._mode; }
|
|
12
18
|
/** Creates and attaches an logger instance created from the current mode */
|
|
13
19
|
create(name, mode = undefined) {
|
|
14
|
-
const
|
|
20
|
+
const impl = this._createImplementation(mode);
|
|
21
|
+
const result = (0, batch_js_1.batchLoggers)(impl, ...this._destinations);
|
|
15
22
|
const proxy = new proxy_js_1.ProxyLogger(result, name);
|
|
16
23
|
this._managed.add(proxy);
|
|
17
24
|
this._all.add(proxy);
|
|
18
25
|
return proxy;
|
|
19
26
|
}
|
|
20
|
-
/** Attaches existing instance, optionally adds name prefix to it
|
|
27
|
+
/** Attaches existing instance, optionally adds name prefix to it.
|
|
28
|
+
*
|
|
29
|
+
* Useful when it's needed to enable/disable independent logger when this manager's mode changes.
|
|
30
|
+
*
|
|
31
|
+
* @returns - The attached logger instance wrapped in a ProxyLogger.
|
|
32
|
+
*/
|
|
21
33
|
attach(instance, name) {
|
|
22
34
|
const proxy = new proxy_js_1.ProxyLogger(instance, name);
|
|
23
35
|
this._all.add(proxy);
|
|
24
|
-
|
|
36
|
+
this._updateAll(this._mode);
|
|
37
|
+
return proxy;
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Adds a destination to the logger manager.
|
|
41
|
+
*
|
|
42
|
+
* This is useful for analytics or other purposes where you want to log to multiple destinations.
|
|
43
|
+
*
|
|
44
|
+
* @param target - Target logger instance that will recieve all logs disregarding current active mode.
|
|
45
|
+
* @param name - An optional name for the destination (prepended to every log message).
|
|
46
|
+
* @returns - A function to remove the destination.
|
|
47
|
+
*/
|
|
48
|
+
addDestination(target, name) {
|
|
49
|
+
const proxy = new proxy_js_1.ProxyLogger(target, name);
|
|
50
|
+
this._destinations.push(proxy);
|
|
51
|
+
this._updateAll(this._mode);
|
|
52
|
+
return () => {
|
|
53
|
+
const index = this._destinations.findIndex((d) => d === proxy);
|
|
54
|
+
if (index !== -1) {
|
|
55
|
+
this._destinations.splice(index, 1);
|
|
56
|
+
this._updateAll(this._mode);
|
|
57
|
+
}
|
|
58
|
+
};
|
|
25
59
|
}
|
|
26
|
-
/**
|
|
60
|
+
/**
|
|
61
|
+
* Sets the current mode if changed, for all attached instances.
|
|
62
|
+
*
|
|
63
|
+
* All internally created loggers implementation will be overridden with a new implementation according to the new mode.
|
|
64
|
+
*
|
|
65
|
+
* The rest just attached loggers will be just enabled/disabled based on input mode.
|
|
66
|
+
* */
|
|
27
67
|
setMode(mode) {
|
|
28
68
|
if (this._mode === mode) {
|
|
29
69
|
return;
|
|
30
70
|
}
|
|
31
71
|
this._mode = mode || false;
|
|
32
|
-
|
|
33
|
-
for (const l of this._all) {
|
|
34
|
-
l.disable();
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
else {
|
|
38
|
-
for (const l of this._all) {
|
|
39
|
-
if (this._managed.has(l)) {
|
|
40
|
-
l.setLogger(this._createImplementation());
|
|
41
|
-
}
|
|
42
|
-
else {
|
|
43
|
-
l.enable();
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
}
|
|
72
|
+
this._updateAll(this._mode);
|
|
47
73
|
}
|
|
48
74
|
recognize(instance) {
|
|
49
75
|
const result = this._findInstance(instance);
|
|
@@ -62,6 +88,30 @@ class LoggersManager {
|
|
|
62
88
|
}
|
|
63
89
|
return true;
|
|
64
90
|
}
|
|
91
|
+
_updateAll(mode) {
|
|
92
|
+
if (!mode) {
|
|
93
|
+
for (const l of this._all) {
|
|
94
|
+
l.disable();
|
|
95
|
+
}
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
// implementation is shared for all attached loggers
|
|
99
|
+
const impl = this._createImplementation();
|
|
100
|
+
if (!impl && this._destinations.length === 0) {
|
|
101
|
+
// ending up with missing implementation
|
|
102
|
+
this._updateAll(false);
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
const result = (0, batch_js_1.batchLoggers)(impl, ...this._destinations);
|
|
106
|
+
for (const l of this._all) {
|
|
107
|
+
if (this._managed.has(l)) {
|
|
108
|
+
l.setLogger(result);
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
l.enable();
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
65
115
|
_findInstance(instance) {
|
|
66
116
|
if (!(instance instanceof proxy_js_1.ProxyLogger)) {
|
|
67
117
|
return false;
|
|
@@ -80,7 +130,7 @@ class LoggersManager {
|
|
|
80
130
|
return null;
|
|
81
131
|
}
|
|
82
132
|
default: {
|
|
83
|
-
return getter_js_1.Getter.
|
|
133
|
+
return getter_js_1.Getter.toValue(mode);
|
|
84
134
|
}
|
|
85
135
|
}
|
|
86
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/logger/manager.ts"],"names":[],"mappings":";;;AAAA,kDAA4C;AAE5C,6CAAuC;AACvC,yCAAyC;
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/logger/manager.ts"],"names":[],"mappings":"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"}
|
package/cjs/logger/named.js
CHANGED
|
@@ -1,35 +1,38 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.NamedLogger =
|
|
4
|
-
const
|
|
5
|
-
exports.EMPTY_FUNCTION = EMPTY_FUNCTION;
|
|
3
|
+
exports.NamedLogger = void 0;
|
|
4
|
+
const empty_js_1 = require("./empty.js");
|
|
6
5
|
class NamedLogger {
|
|
7
|
-
log =
|
|
8
|
-
warn =
|
|
9
|
-
error =
|
|
6
|
+
log = empty_js_1.EMPTY_FUNCTION;
|
|
7
|
+
warn = empty_js_1.EMPTY_FUNCTION;
|
|
8
|
+
error = empty_js_1.EMPTY_FUNCTION;
|
|
10
9
|
_name = null;
|
|
10
|
+
_enabled = false;
|
|
11
11
|
get name() { return this._name; }
|
|
12
12
|
constructor(name) {
|
|
13
13
|
this._name = name || null;
|
|
14
14
|
this.disable();
|
|
15
15
|
}
|
|
16
|
+
get isEnabled() { return this._enabled; }
|
|
16
17
|
enable(overrideName = null) {
|
|
17
18
|
this._name = overrideName || this._name;
|
|
19
|
+
this._enabled = true;
|
|
18
20
|
this.log = this._name
|
|
19
21
|
? (...args) => this.implementation.log(this._name, ...args)
|
|
20
|
-
: this.implementation.log;
|
|
22
|
+
: this.implementation.log.bind(this.implementation);
|
|
21
23
|
this.warn = this._name
|
|
22
24
|
? (...args) => this.implementation.warn(this._name, ...args)
|
|
23
|
-
: this.implementation.warn;
|
|
25
|
+
: this.implementation.warn.bind(this.implementation);
|
|
24
26
|
this.error = this._name
|
|
25
27
|
? (...args) => this.implementation.error(this._name, ...args)
|
|
26
|
-
: this.implementation.error;
|
|
28
|
+
: this.implementation.error.bind(this.implementation);
|
|
27
29
|
return this;
|
|
28
30
|
}
|
|
29
31
|
disable() {
|
|
30
|
-
this.
|
|
31
|
-
this.
|
|
32
|
-
this.
|
|
32
|
+
this._enabled = false;
|
|
33
|
+
this.log = empty_js_1.EMPTY_FUNCTION;
|
|
34
|
+
this.warn = empty_js_1.EMPTY_FUNCTION;
|
|
35
|
+
this.error = empty_js_1.EMPTY_FUNCTION;
|
|
33
36
|
return this;
|
|
34
37
|
}
|
|
35
38
|
}
|
package/cjs/logger/named.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"named.js","sourceRoot":"","sources":["../../../src/logger/named.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"named.js","sourceRoot":"","sources":["../../../src/logger/named.ts"],"names":[],"mappings":";;;AAAA,yCAA4C;AAG5C,MAAsB,WAAW;IACtB,GAAG,GAAmB,yBAAc,CAAC;IACrC,IAAI,GAAmB,yBAAc,CAAC;IACtC,KAAK,GAAmB,yBAAc,CAAC;IAEtC,KAAK,GAAkB,IAAI,CAAC;IAC5B,QAAQ,GAAG,KAAK,CAAC;IAEzB,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAEjC,YAAY,IAAa;QACrB,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,IAAI,CAAC;QAC1B,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAGD,IAAW,SAAS,KAAK,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEhD,MAAM,CAAC,eAA8B,IAAI;QACrC,IAAI,CAAC,KAAK,GAAG,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC;QACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QAErB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK;YACjB,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC;YAC3D,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAExD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK;YAClB,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC;YAC5D,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEzD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK;YACnB,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC;YAC7D,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAE1D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO;QACH,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QAEtB,IAAI,CAAC,GAAG,GAAG,yBAAc,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,yBAAc,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,yBAAc,CAAC;QAE5B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AA9CD,kCA8CC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LoggerProvider = void 0;
|
|
4
|
+
const loggable_js_1 = require("./loggable.js");
|
|
5
|
+
/** Logger instance holder, for re-usability */
|
|
6
|
+
class LoggerProvider extends loggable_js_1.Loggable {
|
|
7
|
+
_factory = null;
|
|
8
|
+
constructor(nameFormatter, logger) {
|
|
9
|
+
super(logger);
|
|
10
|
+
if (nameFormatter) {
|
|
11
|
+
this.getLoggerName = nameFormatter;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
// changing visibility to public
|
|
15
|
+
get logger() {
|
|
16
|
+
return super.logger;
|
|
17
|
+
}
|
|
18
|
+
get factory() {
|
|
19
|
+
return this._factory;
|
|
20
|
+
}
|
|
21
|
+
setLoggerFactory(factory, ...args) {
|
|
22
|
+
this._factory = factory;
|
|
23
|
+
return super.setLoggerFactory(factory, ...args);
|
|
24
|
+
}
|
|
25
|
+
createLogger(...args) {
|
|
26
|
+
if (!this._factory) {
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
return this._createLogger(this._factory, ...args);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
exports.LoggerProvider = LoggerProvider;
|
|
33
|
+
//# sourceMappingURL=provider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/logger/provider.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAIzC,+CAA+C;AAC/C,MAAa,cAAe,SAAQ,sBAAQ;IAEhC,QAAQ,GAA0B,IAAI,CAAC;IAE/C,YAAY,aAAoD,EAAE,MAAgB;QAC9E,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,aAAa,EAAE,CAAC;YAChB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACvC,CAAC;IACL,CAAC;IAED,gCAAgC;IAChC,IAAW,MAAM;QACb,OAAO,KAAK,CAAC,MAAM,CAAC;IACxB,CAAC;IAED,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEM,gBAAgB,CAAC,OAA8B,EAAE,GAAG,IAAgC;QACvF,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,OAAO,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACpD,CAAC;IAEM,YAAY,CAAC,GAAG,IAAgC;QACnD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;IACtD,CAAC;CACJ;AA/BD,wCA+BC"}
|
package/cjs/logger/proxy.js
CHANGED
|
@@ -1,14 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ProxyLogger =
|
|
3
|
+
exports.ProxyLogger = void 0;
|
|
4
4
|
const named_js_1 = require("./named.js");
|
|
5
|
-
|
|
6
|
-
log: named_js_1.EMPTY_FUNCTION,
|
|
7
|
-
warn: named_js_1.EMPTY_FUNCTION,
|
|
8
|
-
error: named_js_1.EMPTY_FUNCTION,
|
|
9
|
-
};
|
|
5
|
+
const empty_js_1 = require("./empty.js");
|
|
10
6
|
class ProxyLogger extends named_js_1.NamedLogger {
|
|
11
|
-
get implementation() { return this._logger ||
|
|
7
|
+
get implementation() { return this._logger || empty_js_1.EMPTY_LOGGER; }
|
|
12
8
|
_logger = null;
|
|
13
9
|
constructor(logger, name = undefined) {
|
|
14
10
|
super(name);
|
package/cjs/logger/proxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/logger/proxy.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/logger/proxy.ts"],"names":[],"mappings":";;;AACA,yCAAyC;AACzC,yCAA0C;AAE1C,MAAa,WAAY,SAAQ,sBAAW;IAExC,IAAc,cAAc,KAAK,OAAO,IAAI,CAAC,OAAO,IAAI,uBAAY,CAAC,CAAC,CAAC;IAE/D,OAAO,GAAmB,IAAI,CAAC;IAEvC,YAAY,MAAkC,EAAE,OAA2B,SAAS;QAChF,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC;IAEM,SAAS,CAAC,MAAkC;QAC/C,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC;QAC9B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC;IACL,CAAC;CACJ;AAnBD,kCAmBC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/logger/types.ts"],"names":[],"mappings":";;;AAiBa,QAAA,SAAS,GAAG;IACrB,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;CACsC,CAAC"}
|
package/cjs/models/LogicModel.js
CHANGED
|
@@ -4,17 +4,19 @@ exports.ActionResult = exports.LogicModel = void 0;
|
|
|
4
4
|
const Loading_js_1 = require("./Loading.js");
|
|
5
5
|
const index_js_1 = require("../types/index.js");
|
|
6
6
|
const promiseExtended_js_1 = require("../structures/promiseExtended.js");
|
|
7
|
-
const
|
|
8
|
-
class LogicModel {
|
|
7
|
+
const loggable_js_1 = require("../logger/loggable.js");
|
|
8
|
+
class LogicModel extends loggable_js_1.Loggable {
|
|
9
9
|
_loading;
|
|
10
10
|
get isLoading() { return this._loading.isLoading; }
|
|
11
|
-
logger;
|
|
12
11
|
_namedRunners = new Map();
|
|
13
12
|
_runningActionNames = new Set();
|
|
14
|
-
constructor(
|
|
15
|
-
|
|
13
|
+
constructor(useFirstInit = true) {
|
|
14
|
+
super();
|
|
16
15
|
this._loading = this.pureConstructLoadingModel(useFirstInit);
|
|
17
16
|
}
|
|
17
|
+
getLoggerName(name) {
|
|
18
|
+
return `[${name || this.constructor.name}]`;
|
|
19
|
+
}
|
|
18
20
|
pureConstructLoadingModel(useFirstInit) {
|
|
19
21
|
return new Loading_js_1.LoadingModel(useFirstInit);
|
|
20
22
|
}
|
|
@@ -22,7 +24,7 @@ class LogicModel {
|
|
|
22
24
|
const started = Date.now();
|
|
23
25
|
const name = options.name;
|
|
24
26
|
if (name && !options.noLogs) {
|
|
25
|
-
this.logger
|
|
27
|
+
this.logger?.log(`runAction "${name}" started...`);
|
|
26
28
|
}
|
|
27
29
|
const runner = async () => {
|
|
28
30
|
const { exclusive = false, noLoading = false, join } = options;
|
|
@@ -32,13 +34,13 @@ class LogicModel {
|
|
|
32
34
|
if (existingRunner != null) {
|
|
33
35
|
if (join === 'cancel') {
|
|
34
36
|
if (!options.noLogs) {
|
|
35
|
-
this.logger
|
|
37
|
+
this.logger?.warn(`runAction "${name}" has been skipped because another instance of it is in progress`);
|
|
36
38
|
}
|
|
37
39
|
return undefined;
|
|
38
40
|
}
|
|
39
41
|
else if (join === 'merge') {
|
|
40
42
|
if (!options.noLogs) {
|
|
41
|
-
this.logger
|
|
43
|
+
this.logger?.log(`runAction "${name}" merging with existing instance...`);
|
|
42
44
|
}
|
|
43
45
|
return existingRunner;
|
|
44
46
|
}
|
|
@@ -57,7 +59,7 @@ class LogicModel {
|
|
|
57
59
|
if (exclusive === 'throw') {
|
|
58
60
|
throw new Loading_js_1.ExclusiveLoadingError(message, storedName);
|
|
59
61
|
}
|
|
60
|
-
this.logger
|
|
62
|
+
this.logger?.warn(message);
|
|
61
63
|
return undefined;
|
|
62
64
|
}
|
|
63
65
|
result = resultWithLoading.result;
|
|
@@ -66,7 +68,7 @@ class LogicModel {
|
|
|
66
68
|
result = await worker();
|
|
67
69
|
}
|
|
68
70
|
if (name && !options.noLogs) {
|
|
69
|
-
this.logger
|
|
71
|
+
this.logger?.log(`runAction "${storedName}" succeed in ${Date.now() - started}ms`);
|
|
70
72
|
}
|
|
71
73
|
return result;
|
|
72
74
|
}
|
|
@@ -88,7 +90,7 @@ class LogicModel {
|
|
|
88
90
|
};
|
|
89
91
|
return ActionResult.expectExclusive(promiseExtended_js_1.PromiseExtended.run(runner))
|
|
90
92
|
.onError(data => {
|
|
91
|
-
this.logger
|
|
93
|
+
this.logger?.error(...formatError({
|
|
92
94
|
name,
|
|
93
95
|
err: data.source,
|
|
94
96
|
errorCtx,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogicModel.js","sourceRoot":"","sources":["../../../src/models/LogicModel.ts"],"names":[],"mappings":";;;AAAA,6CAAgF;AAChF,gDAAqD;AACrD,yEAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"LogicModel.js","sourceRoot":"","sources":["../../../src/models/LogicModel.ts"],"names":[],"mappings":"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"}
|