@zajno/common 2.4.2 → 2.4.3
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/math/object/math.composite.js +15 -5
- package/cjs/math/object/math.composite.js.map +1 -1
- package/cjs/models/Loading.js +12 -4
- package/cjs/models/Loading.js.map +1 -1
- package/cjs/models/LogicModel.js +19 -5
- package/cjs/models/LogicModel.js.map +1 -1
- package/cjs/structures/promiseExtended.js +15 -1
- package/cjs/structures/promiseExtended.js.map +1 -1
- package/esm/math/object/math.composite.js +15 -5
- package/esm/math/object/math.composite.js.map +1 -1
- package/esm/models/Loading.js +10 -3
- package/esm/models/Loading.js.map +1 -1
- package/esm/models/LogicModel.js +19 -5
- package/esm/models/LogicModel.js.map +1 -1
- package/esm/structures/promiseExtended.js +15 -1
- package/esm/structures/promiseExtended.js.map +1 -1
- package/package.json +1 -1
- package/types/models/Loading.d.ts +6 -2
- package/types/models/LogicModel.d.ts +17 -4
- package/types/structures/promiseExtended.d.ts +9 -0
|
@@ -48,14 +48,24 @@ class CompositeObjectMath extends ops_composite_1.CompositeObjectOps {
|
|
|
48
48
|
if (this.isEmpty(o1)) {
|
|
49
49
|
return 0;
|
|
50
50
|
}
|
|
51
|
-
|
|
51
|
+
const checkRight = (val, getIsEmpty) => {
|
|
52
|
+
return typeof val === 'number' && val === 0 || typeof val !== 'number' && getIsEmpty(val);
|
|
53
|
+
};
|
|
54
|
+
if (checkRight(o2, v => this.isEmpty(v))) {
|
|
52
55
|
return Number.POSITIVE_INFINITY;
|
|
53
56
|
}
|
|
54
|
-
const
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
+
const results = this._math.map(pair => {
|
|
58
|
+
const left = (0, helpers_1._getInnerValue)(o1, pair.key);
|
|
59
|
+
if (pair.ops.isEmpty(left)) {
|
|
60
|
+
return 0;
|
|
61
|
+
}
|
|
62
|
+
const right = (0, helpers_1._getInnerValue)(o2, pair.key);
|
|
63
|
+
if (checkRight(right, v => pair.ops.isEmpty(v))) {
|
|
64
|
+
return 0;
|
|
65
|
+
}
|
|
66
|
+
return pair.ops.div(left, right);
|
|
57
67
|
}).filter(Boolean);
|
|
58
|
-
return Math.min(...
|
|
68
|
+
return results.length ? Math.min(...results) : 0;
|
|
59
69
|
}
|
|
60
70
|
}
|
|
61
71
|
exports.CompositeObjectMath = CompositeObjectMath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"math.composite.js","sourceRoot":"","sources":["../../../../src/math/object/math.composite.ts"],"names":[],"mappings":";;;AAEA,uCAAkD;AAClD,mDAAqD;AAIrD,MAAa,mBAAyC,SAAQ,kCAAqB;IAC9D,KAAK,CAAgB;IAEtC,YAAY,SAA0B;QAClC,KAAK,CAAC,SAAS,CAAC,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;aACjC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACV,GAAG,EAAE,IAAI,CAAC,CAAC,CAAqB;YAChC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAqC;SACnD,CAAC,CAAC,CAAC;IACZ,CAAC;IAED,QAAQ,CAAC,IAAqB,EAAE,MAAuB;QACnD,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC3B,MAAM,OAAO,GAAG,IAAA,wBAAc,EAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/C,MAAM,SAAS,GAAG,IAAA,wBAAc,EAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YACnD,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,CAAkB;QACtB,OAAO,IAAA,eAAK,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,GAAG,CAAC,CAAkB,EAAE,OAAoB;QACxC,OAAO,IAAA,eAAK,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,CAAkB,EAAE,OAAsB;QAC5C,OAAO,IAAA,eAAK,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,GAAG,CAAC,EAAmB,EAAE,EAAmB;QACxC,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC3B,CAAC;QAED,OAAO,IAAA,eAAK,EAAC,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAA,wBAAc,EAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAC3F,CAAC;IAED,QAAQ,CAAC,IAAqB,EAAE,MAAgC;QAC5D,OAAO,IAAA,eAAK,EACR,IAAI,CAAC,KAAK,EACV,IAAI,EACJ,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAC3B,GAAG,EACH,IAAA,wBAAc,EAAC,MAAM,EAAE,GAAG,CAAC,CAC9B,CACJ,CAAC;IACN,CAAC;IAED,QAAQ,CAAC,EAAmB,EAAE,EAA4B;QACtD,OAAO,IAAA,eAAK,EACR,IAAI,CAAC,KAAK,EACV,EAAE,EACF,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAC3B,GAAG,EACH,IAAA,wBAAc,EAAC,EAAE,EAAE,GAAG,CAAC,CAC1B,CACJ,CAAC;IACN,CAAC;IAED,GAAG,CAAC,EAAmB,EAAE,EAA4B;QACjD,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YACnB,OAAO,CAAC,CAAC;QACb,CAAC;QAED,
|
|
1
|
+
{"version":3,"file":"math.composite.js","sourceRoot":"","sources":["../../../../src/math/object/math.composite.ts"],"names":[],"mappings":"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"}
|
package/cjs/models/Loading.js
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.LoadingModel = void 0;
|
|
3
|
+
exports.ExclusiveLoadingError = exports.LoadingModel = void 0;
|
|
4
4
|
exports.withLoading = withLoading;
|
|
5
5
|
const Model_1 = require("./Model");
|
|
6
6
|
async function withLoading(model, cb, exclusive = false) {
|
|
7
7
|
if (exclusive && model.value) {
|
|
8
8
|
if (exclusive === 'throw') {
|
|
9
|
-
throw new
|
|
9
|
+
throw new ExclusiveLoadingError();
|
|
10
10
|
}
|
|
11
|
-
return {
|
|
11
|
+
return { aborted: true };
|
|
12
12
|
}
|
|
13
13
|
model.value = true;
|
|
14
14
|
try {
|
|
15
15
|
const res = await cb();
|
|
16
16
|
return {
|
|
17
|
-
|
|
17
|
+
aborted: false,
|
|
18
18
|
result: res,
|
|
19
19
|
};
|
|
20
20
|
}
|
|
@@ -69,4 +69,12 @@ class LoadingModel {
|
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
71
|
exports.LoadingModel = LoadingModel;
|
|
72
|
+
class ExclusiveLoadingError extends Error {
|
|
73
|
+
actionName;
|
|
74
|
+
constructor(message = 'Operation cannot be started because another one is in progress already.', actionName) {
|
|
75
|
+
super(message);
|
|
76
|
+
this.actionName = actionName;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
exports.ExclusiveLoadingError = ExclusiveLoadingError;
|
|
72
80
|
//# sourceMappingURL=Loading.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Loading.js","sourceRoot":"","sources":["../../../src/models/Loading.ts"],"names":[],"mappings":";;;AAYA,kCAmBC;AA/BD,mCAAgC;AAYzB,KAAK,UAAU,WAAW,CAAgB,KAA2B,EAAE,EAAoB,EAAE,YAA+B,KAAK;IACpI,IAAI,SAAS,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"Loading.js","sourceRoot":"","sources":["../../../src/models/Loading.ts"],"names":[],"mappings":";;;AAYA,kCAmBC;AA/BD,mCAAgC;AAYzB,KAAK,UAAU,WAAW,CAAgB,KAA2B,EAAE,EAAoB,EAAE,YAA+B,KAAK;IACpI,IAAI,SAAS,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,IAAI,qBAAqB,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;IAEnB,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;QACvB,OAAO;YACH,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,GAAG;SACd,CAAC;IACN,CAAC;YAAS,CAAC;QACP,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IACxB,CAAC;AACL,CAAC;AAED,MAAa,YAAY;IAEJ,OAAO,CAAwC;IACtD,UAAU,CAAU;IAE9B;;OAEG;IACH,YAAY,YAAY,GAAG,KAAK;QAC5B,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;IACnD,CAAC;IAED,IAAW,SAAS,KAAK,OAAO,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAEhE,IAAW,KAAK,KAAc,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAE9D,IAAW,KAAK,CAAC,CAAU;QACvB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;IAEM,UAAU,CAAI,EAAoB,EAAE,YAA+B,KAAK;QAC3E,OAAO,WAAW,CAAC,IAAI,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC;IAEM,KAAK,GAAG,GAAG,EAAE;QAChB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC,CAAC;IAEQ,QAAQ,CAAC,SAAkB;QACjC,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC5B,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YACxB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC5B,CAAC;IACL,CAAC;IAED,kBAAkB;IACR,gBAAgB;QACtB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,kBAAkB;IACR,gBAAgB;QACtB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAED;;0EAEsE;IAC5D,wBAAwB;QAC9B,OAAO,IAAI,aAAK,CAAS,CAAC,CAAC,CAAC;IAChC,CAAC;CACJ;AAvDD,oCAuDC;AAED,MAAa,qBAAsB,SAAQ,KAAK;IAIxB;IAFpB,YACI,OAAO,GAAG,yEAAyE,EACnE,UAAmB;QAEnC,KAAK,CAAC,OAAO,CAAC,CAAC;QAFC,eAAU,GAAV,UAAU,CAAS;IAGvC,CAAC;CACJ;AARD,sDAQC"}
|
package/cjs/models/LogicModel.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.LogicModel = void 0;
|
|
3
|
+
exports.ActionResult = exports.LogicModel = void 0;
|
|
4
4
|
const Loading_1 = require("./Loading");
|
|
5
5
|
const types_1 = require("../types");
|
|
6
6
|
const promiseExtended_1 = require("../structures/promiseExtended");
|
|
@@ -51,11 +51,11 @@ class LogicModel {
|
|
|
51
51
|
let result;
|
|
52
52
|
if (!noLoading) {
|
|
53
53
|
const resultWithLoading = await (0, Loading_1.withLoading)(this._loading, worker, !!exclusive);
|
|
54
|
-
if (resultWithLoading.
|
|
54
|
+
if (resultWithLoading.aborted) {
|
|
55
55
|
const othersNames = Array.from(this._runningActionNames, n => `"${n}"`).join(', ') || '<?>';
|
|
56
56
|
const message = `runAction(exclusive=${exclusive}): "${storedName}" has been skipped, others in progress: ${othersNames}`;
|
|
57
57
|
if (exclusive === 'throw') {
|
|
58
|
-
throw new
|
|
58
|
+
throw new Loading_1.ExclusiveLoadingError(message, storedName);
|
|
59
59
|
}
|
|
60
60
|
this.logger.warn(message);
|
|
61
61
|
return undefined;
|
|
@@ -86,8 +86,7 @@ class LogicModel {
|
|
|
86
86
|
this._namedRunners.delete(name);
|
|
87
87
|
}
|
|
88
88
|
};
|
|
89
|
-
return promiseExtended_1.PromiseExtended.run(runner)
|
|
90
|
-
// .expectError('network', NetworkError)
|
|
89
|
+
return ActionResult.expectExclusive(promiseExtended_1.PromiseExtended.run(runner))
|
|
91
90
|
.onError(data => {
|
|
92
91
|
this.logger.error(...formatError({
|
|
93
92
|
name,
|
|
@@ -117,4 +116,19 @@ function formatError({ name, err, errorCtx, elapsed }) {
|
|
|
117
116
|
...prepend(types_1.Getter.toValue(errorCtx), '\nContext:'),
|
|
118
117
|
];
|
|
119
118
|
}
|
|
119
|
+
var ActionResult;
|
|
120
|
+
(function (ActionResult) {
|
|
121
|
+
let Expect;
|
|
122
|
+
(function (Expect) {
|
|
123
|
+
Expect.Config = {
|
|
124
|
+
name: 'exclusive',
|
|
125
|
+
ErrCtor: Loading_1.ExclusiveLoadingError,
|
|
126
|
+
};
|
|
127
|
+
})(Expect = ActionResult.Expect || (ActionResult.Expect = {}));
|
|
128
|
+
ActionResult.expectExclusive = promiseExtended_1.PromiseExtended.ErrorConfig.createExpecter(Expect.Config);
|
|
129
|
+
function createSucceeded(data) {
|
|
130
|
+
return ActionResult.expectExclusive(promiseExtended_1.PromiseExtended.succeeded(data));
|
|
131
|
+
}
|
|
132
|
+
ActionResult.createSucceeded = createSucceeded;
|
|
133
|
+
})(ActionResult || (exports.ActionResult = ActionResult = {}));
|
|
120
134
|
//# sourceMappingURL=LogicModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogicModel.js","sourceRoot":"","sources":["../../../src/models/LogicModel.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"LogicModel.js","sourceRoot":"","sources":["../../../src/models/LogicModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,7 +87,10 @@ class PromiseExtended {
|
|
|
87
87
|
}
|
|
88
88
|
return this;
|
|
89
89
|
}
|
|
90
|
-
expectError(
|
|
90
|
+
expectError(nameOrConfig, _ErrCtor, _processor) {
|
|
91
|
+
const { name, ErrCtor, processor } = typeof nameOrConfig === 'string'
|
|
92
|
+
? { name: nameOrConfig, ErrCtor: _ErrCtor, processor: _processor }
|
|
93
|
+
: nameOrConfig;
|
|
91
94
|
this._errorProcessors.push(errorData => {
|
|
92
95
|
const src = errorData?.source;
|
|
93
96
|
if (src && src instanceof ErrCtor) {
|
|
@@ -166,6 +169,17 @@ class PromiseExtended {
|
|
|
166
169
|
}
|
|
167
170
|
}
|
|
168
171
|
exports.PromiseExtended = PromiseExtended;
|
|
172
|
+
(function (PromiseExtended) {
|
|
173
|
+
let ErrorConfig;
|
|
174
|
+
(function (ErrorConfig) {
|
|
175
|
+
function createExpecter(config) {
|
|
176
|
+
return (promise, processor) => {
|
|
177
|
+
return promise.expectError({ ...config, processor });
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
ErrorConfig.createExpecter = createExpecter;
|
|
181
|
+
})(ErrorConfig = PromiseExtended.ErrorConfig || (PromiseExtended.ErrorConfig = {}));
|
|
182
|
+
})(PromiseExtended || (exports.PromiseExtended = PromiseExtended = {}));
|
|
169
183
|
/*
|
|
170
184
|
|
|
171
185
|
Idea: would be nice to combine few Promises and PromiseExtended's into one PromiseExtended instance, so the final result will be handled by onSuccess/onError
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promiseExtended.js","sourceRoot":"","sources":["../../../src/structures/promiseExtended.ts"],"names":[],"mappings":";;;AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAa,eAAe;IAEd,MAAM,GAAqC,IAAI,CAAC;IAElD,QAAQ,CAAa;IACZ,gBAAgB,GAAkD,EAAE,CAAC;IAEtF,YAAoB,OAAmB;QACnC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAe,CAAC;IAC7D,CAAC;IAEM,MAAM,CAAC,GAAG,CAAsE,MAAuC;QAC1H,MAAM,OAAO,GAAG,OAAO,MAAM,KAAK,UAAU;YACxC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC;YACxB,CAAC,CAAC,MAAM,CAAC;QAEb,IAAI,OAAO,YAAY,eAAe,EAAE,CAAC;YACrC,OAAO,OAAO,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,eAAe,CAAa,OAAO,CAAC,CAAC;IACpD,CAAC;IAEM,MAAM,CAAC,SAAS,CAAI,IAAO;QAC9B,OAAO,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,MAAM,CAAC,OAAO,CAA6C,MAAgC;QAC9F,MAAM,GAAG,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACpE,MAAM,OAAO,GAAG,IAAI,eAAe;QAC/B,2EAA2E;QAC3E,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CACtB,CAAC;QACF,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,OAAO,CAAC,EAAuE;QAClF,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;YACb,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACtC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;oBACd,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACxB,CAAC;gBACD,OAAO,IAAI,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,SAAS,CAAC,EAA+B;QAC5C,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;YACb,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACtC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACf,EAAE,CAAC,IAAI,CAAC,CAAC;gBACb,CAAC;gBACD,OAAO,IAAI,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;
|
|
1
|
+
{"version":3,"file":"promiseExtended.js","sourceRoot":"","sources":["../../../src/structures/promiseExtended.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,14 +45,24 @@ export class CompositeObjectMath extends CompositeObjectOps {
|
|
|
45
45
|
if (this.isEmpty(o1)) {
|
|
46
46
|
return 0;
|
|
47
47
|
}
|
|
48
|
-
|
|
48
|
+
const checkRight = (val, getIsEmpty) => {
|
|
49
|
+
return typeof val === 'number' && val === 0 || typeof val !== 'number' && getIsEmpty(val);
|
|
50
|
+
};
|
|
51
|
+
if (checkRight(o2, v => this.isEmpty(v))) {
|
|
49
52
|
return Number.POSITIVE_INFINITY;
|
|
50
53
|
}
|
|
51
|
-
const
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
+
const results = this._math.map(pair => {
|
|
55
|
+
const left = _getInnerValue(o1, pair.key);
|
|
56
|
+
if (pair.ops.isEmpty(left)) {
|
|
57
|
+
return 0;
|
|
58
|
+
}
|
|
59
|
+
const right = _getInnerValue(o2, pair.key);
|
|
60
|
+
if (checkRight(right, v => pair.ops.isEmpty(v))) {
|
|
61
|
+
return 0;
|
|
62
|
+
}
|
|
63
|
+
return pair.ops.div(left, right);
|
|
54
64
|
}).filter(Boolean);
|
|
55
|
-
return Math.min(...
|
|
65
|
+
return results.length ? Math.min(...results) : 0;
|
|
56
66
|
}
|
|
57
67
|
}
|
|
58
68
|
//# sourceMappingURL=math.composite.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"math.composite.js","sourceRoot":"","sources":["../../../../src/math/object/math.composite.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"math.composite.js","sourceRoot":"","sources":["../../../../src/math/object/math.composite.ts"],"names":[],"mappings":"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"}
|
package/esm/models/Loading.js
CHANGED
|
@@ -2,15 +2,15 @@ import { Model } from './Model';
|
|
|
2
2
|
export async function withLoading(model, cb, exclusive = false) {
|
|
3
3
|
if (exclusive && model.value) {
|
|
4
4
|
if (exclusive === 'throw') {
|
|
5
|
-
throw new
|
|
5
|
+
throw new ExclusiveLoadingError();
|
|
6
6
|
}
|
|
7
|
-
return {
|
|
7
|
+
return { aborted: true };
|
|
8
8
|
}
|
|
9
9
|
model.value = true;
|
|
10
10
|
try {
|
|
11
11
|
const res = await cb();
|
|
12
12
|
return {
|
|
13
|
-
|
|
13
|
+
aborted: false,
|
|
14
14
|
result: res,
|
|
15
15
|
};
|
|
16
16
|
}
|
|
@@ -64,4 +64,11 @@ export class LoadingModel {
|
|
|
64
64
|
return new Model(0);
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
|
+
export class ExclusiveLoadingError extends Error {
|
|
68
|
+
actionName;
|
|
69
|
+
constructor(message = 'Operation cannot be started because another one is in progress already.', actionName) {
|
|
70
|
+
super(message);
|
|
71
|
+
this.actionName = actionName;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
67
74
|
//# sourceMappingURL=Loading.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Loading.js","sourceRoot":"","sources":["../../../src/models/Loading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAYhC,MAAM,CAAC,KAAK,UAAU,WAAW,CAAgB,KAA2B,EAAE,EAAoB,EAAE,YAA+B,KAAK;IACpI,IAAI,SAAS,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"Loading.js","sourceRoot":"","sources":["../../../src/models/Loading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAYhC,MAAM,CAAC,KAAK,UAAU,WAAW,CAAgB,KAA2B,EAAE,EAAoB,EAAE,YAA+B,KAAK;IACpI,IAAI,SAAS,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,IAAI,qBAAqB,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;IAEnB,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;QACvB,OAAO;YACH,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,GAAG;SACd,CAAC;IACN,CAAC;YAAS,CAAC;QACP,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IACxB,CAAC;AACL,CAAC;AAED,MAAM,OAAO,YAAY;IAEJ,OAAO,CAAwC;IACtD,UAAU,CAAU;IAE9B;;OAEG;IACH,YAAY,YAAY,GAAG,KAAK;QAC5B,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;IACnD,CAAC;IAED,IAAW,SAAS,KAAK,OAAO,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAEhE,IAAW,KAAK,KAAc,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAE9D,IAAW,KAAK,CAAC,CAAU;QACvB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;IAEM,UAAU,CAAI,EAAoB,EAAE,YAA+B,KAAK;QAC3E,OAAO,WAAW,CAAC,IAAI,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC;IAEM,KAAK,GAAG,GAAG,EAAE;QAChB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC,CAAC;IAEQ,QAAQ,CAAC,SAAkB;QACjC,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC5B,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YACxB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC5B,CAAC;IACL,CAAC;IAED,kBAAkB;IACR,gBAAgB;QACtB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,kBAAkB;IACR,gBAAgB;QACtB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAED;;0EAEsE;IAC5D,wBAAwB;QAC9B,OAAO,IAAI,KAAK,CAAS,CAAC,CAAC,CAAC;IAChC,CAAC;CACJ;AAED,MAAM,OAAO,qBAAsB,SAAQ,KAAK;IAIxB;IAFpB,YACI,OAAO,GAAG,yEAAyE,EACnE,UAAmB;QAEnC,KAAK,CAAC,OAAO,CAAC,CAAC;QAFC,eAAU,GAAV,UAAU,CAAS;IAGvC,CAAC;CACJ"}
|
package/esm/models/LogicModel.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { LoadingModel, withLoading } from './Loading';
|
|
1
|
+
import { ExclusiveLoadingError, LoadingModel, withLoading } from './Loading';
|
|
2
2
|
import { Getter } from '../types';
|
|
3
3
|
import { PromiseExtended } from '../structures/promiseExtended';
|
|
4
4
|
import { createLogger } from '../logger';
|
|
@@ -48,11 +48,11 @@ export class LogicModel {
|
|
|
48
48
|
let result;
|
|
49
49
|
if (!noLoading) {
|
|
50
50
|
const resultWithLoading = await withLoading(this._loading, worker, !!exclusive);
|
|
51
|
-
if (resultWithLoading.
|
|
51
|
+
if (resultWithLoading.aborted) {
|
|
52
52
|
const othersNames = Array.from(this._runningActionNames, n => `"${n}"`).join(', ') || '<?>';
|
|
53
53
|
const message = `runAction(exclusive=${exclusive}): "${storedName}" has been skipped, others in progress: ${othersNames}`;
|
|
54
54
|
if (exclusive === 'throw') {
|
|
55
|
-
throw new
|
|
55
|
+
throw new ExclusiveLoadingError(message, storedName);
|
|
56
56
|
}
|
|
57
57
|
this.logger.warn(message);
|
|
58
58
|
return undefined;
|
|
@@ -83,8 +83,7 @@ export class LogicModel {
|
|
|
83
83
|
this._namedRunners.delete(name);
|
|
84
84
|
}
|
|
85
85
|
};
|
|
86
|
-
return PromiseExtended.run(runner)
|
|
87
|
-
// .expectError('network', NetworkError)
|
|
86
|
+
return ActionResult.expectExclusive(PromiseExtended.run(runner))
|
|
88
87
|
.onError(data => {
|
|
89
88
|
this.logger.error(...formatError({
|
|
90
89
|
name,
|
|
@@ -113,4 +112,19 @@ function formatError({ name, err, errorCtx, elapsed }) {
|
|
|
113
112
|
...prepend(Getter.toValue(errorCtx), '\nContext:'),
|
|
114
113
|
];
|
|
115
114
|
}
|
|
115
|
+
export var ActionResult;
|
|
116
|
+
(function (ActionResult) {
|
|
117
|
+
let Expect;
|
|
118
|
+
(function (Expect) {
|
|
119
|
+
Expect.Config = {
|
|
120
|
+
name: 'exclusive',
|
|
121
|
+
ErrCtor: ExclusiveLoadingError,
|
|
122
|
+
};
|
|
123
|
+
})(Expect = ActionResult.Expect || (ActionResult.Expect = {}));
|
|
124
|
+
ActionResult.expectExclusive = PromiseExtended.ErrorConfig.createExpecter(Expect.Config);
|
|
125
|
+
function createSucceeded(data) {
|
|
126
|
+
return ActionResult.expectExclusive(PromiseExtended.succeeded(data));
|
|
127
|
+
}
|
|
128
|
+
ActionResult.createSucceeded = createSucceeded;
|
|
129
|
+
})(ActionResult || (ActionResult = {}));
|
|
116
130
|
//# sourceMappingURL=LogicModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogicModel.js","sourceRoot":"","sources":["../../../src/models/LogicModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"LogicModel.js","sourceRoot":"","sources":["../../../src/models/LogicModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,10 @@ export class PromiseExtended {
|
|
|
84
84
|
}
|
|
85
85
|
return this;
|
|
86
86
|
}
|
|
87
|
-
expectError(
|
|
87
|
+
expectError(nameOrConfig, _ErrCtor, _processor) {
|
|
88
|
+
const { name, ErrCtor, processor } = typeof nameOrConfig === 'string'
|
|
89
|
+
? { name: nameOrConfig, ErrCtor: _ErrCtor, processor: _processor }
|
|
90
|
+
: nameOrConfig;
|
|
88
91
|
this._errorProcessors.push(errorData => {
|
|
89
92
|
const src = errorData?.source;
|
|
90
93
|
if (src && src instanceof ErrCtor) {
|
|
@@ -162,6 +165,17 @@ export class PromiseExtended {
|
|
|
162
165
|
this._error = data;
|
|
163
166
|
}
|
|
164
167
|
}
|
|
168
|
+
(function (PromiseExtended) {
|
|
169
|
+
let ErrorConfig;
|
|
170
|
+
(function (ErrorConfig) {
|
|
171
|
+
function createExpecter(config) {
|
|
172
|
+
return (promise, processor) => {
|
|
173
|
+
return promise.expectError({ ...config, processor });
|
|
174
|
+
};
|
|
175
|
+
}
|
|
176
|
+
ErrorConfig.createExpecter = createExpecter;
|
|
177
|
+
})(ErrorConfig = PromiseExtended.ErrorConfig || (PromiseExtended.ErrorConfig = {}));
|
|
178
|
+
})(PromiseExtended || (PromiseExtended = {}));
|
|
165
179
|
/*
|
|
166
180
|
|
|
167
181
|
Idea: would be nice to combine few Promises and PromiseExtended's into one PromiseExtended instance, so the final result will be handled by onSuccess/onError
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promiseExtended.js","sourceRoot":"","sources":["../../../src/structures/promiseExtended.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAM,OAAO,eAAe;IAEd,MAAM,GAAqC,IAAI,CAAC;IAElD,QAAQ,CAAa;IACZ,gBAAgB,GAAkD,EAAE,CAAC;IAEtF,YAAoB,OAAmB;QACnC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAe,CAAC;IAC7D,CAAC;IAEM,MAAM,CAAC,GAAG,CAAsE,MAAuC;QAC1H,MAAM,OAAO,GAAG,OAAO,MAAM,KAAK,UAAU;YACxC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC;YACxB,CAAC,CAAC,MAAM,CAAC;QAEb,IAAI,OAAO,YAAY,eAAe,EAAE,CAAC;YACrC,OAAO,OAAO,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,eAAe,CAAa,OAAO,CAAC,CAAC;IACpD,CAAC;IAEM,MAAM,CAAC,SAAS,CAAI,IAAO;QAC9B,OAAO,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,MAAM,CAAC,OAAO,CAA6C,MAAgC;QAC9F,MAAM,GAAG,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACpE,MAAM,OAAO,GAAG,IAAI,eAAe;QAC/B,2EAA2E;QAC3E,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CACtB,CAAC;QACF,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,OAAO,CAAC,EAAuE;QAClF,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;YACb,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACtC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;oBACd,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACxB,CAAC;gBACD,OAAO,IAAI,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,SAAS,CAAC,EAA+B;QAC5C,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;YACb,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACtC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACf,EAAE,CAAC,IAAI,CAAC,CAAC;gBACb,CAAC;gBACD,OAAO,IAAI,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;
|
|
1
|
+
{"version":3,"file":"promiseExtended.js","sourceRoot":"","sources":["../../../src/structures/promiseExtended.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import type { IResetableModel, IValueModel } from './types';
|
|
2
2
|
export type LoadingWorker<T> = () => (T | Promise<T>);
|
|
3
3
|
export type LoadingResult<T = unknown> = {
|
|
4
|
-
|
|
4
|
+
aborted: true;
|
|
5
5
|
} | {
|
|
6
|
-
|
|
6
|
+
aborted: false;
|
|
7
7
|
result: T;
|
|
8
8
|
};
|
|
9
9
|
export declare function withLoading<T>(this: void, model: IValueModel<boolean>, cb: LoadingWorker<T>, exclusive?: boolean | 'throw'): Promise<LoadingResult<T>>;
|
|
@@ -29,3 +29,7 @@ export declare class LoadingModel implements IValueModel<boolean>, IResetableMod
|
|
|
29
29
|
* Called in the ctor. Should be pure and should NOT access `this`. */
|
|
30
30
|
protected pureConstructNumberModel(): IValueModel<number> & IResetableModel;
|
|
31
31
|
}
|
|
32
|
+
export declare class ExclusiveLoadingError extends Error {
|
|
33
|
+
readonly actionName?: string | undefined;
|
|
34
|
+
constructor(message?: string, actionName?: string | undefined);
|
|
35
|
+
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { LoadingModel } from './Loading';
|
|
1
|
+
import { ExclusiveLoadingError, LoadingModel } from './Loading';
|
|
2
2
|
import { Getter } from '../types';
|
|
3
3
|
import { PromiseExtended } from '../structures/promiseExtended';
|
|
4
4
|
import { ILogger } from '../logger';
|
|
5
|
-
type
|
|
5
|
+
export type ActionRunOptions = {
|
|
6
6
|
/** Action name, required for logging and joining. */
|
|
7
7
|
name?: string;
|
|
8
8
|
/** If set to truthy, will not start an action if another is still in progress.
|
|
@@ -29,6 +29,19 @@ export declare class LogicModel {
|
|
|
29
29
|
private readonly _runningActionNames;
|
|
30
30
|
constructor(name?: string, useFirstInit?: boolean);
|
|
31
31
|
protected pureConstructLoadingModel(useFirstInit: boolean): LoadingModel;
|
|
32
|
-
protected runAction<T = unknown>(worker: () => Promise<T>, options?:
|
|
32
|
+
protected runAction<T = unknown>(worker: () => Promise<T>, options?: ActionRunOptions, errorCtx?: Getter<unknown>): ActionResult<T>;
|
|
33
|
+
}
|
|
34
|
+
export type ActionResult<T, TCustomErrors extends Record<string, unknown> = Record<never, unknown>> = ReturnType<typeof ActionResult.expectExclusive<T | undefined, TCustomErrors>>;
|
|
35
|
+
export declare namespace ActionResult {
|
|
36
|
+
type Expect = {
|
|
37
|
+
exclusive: ExclusiveLoadingError;
|
|
38
|
+
};
|
|
39
|
+
namespace Expect {
|
|
40
|
+
const Config: {
|
|
41
|
+
readonly name: "exclusive";
|
|
42
|
+
readonly ErrCtor: typeof ExclusiveLoadingError;
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
const expectExclusive: <T, TPrevErrors extends Record<string, unknown>>(promise: PromiseExtended<T, TPrevErrors>, processor?: ((error: ExclusiveLoadingError) => void | Partial<TPrevErrors & Record<"exclusive", ExclusiveLoadingError>>) | undefined) => PromiseExtended<T, TPrevErrors & Record<"exclusive", ExclusiveLoadingError>>;
|
|
46
|
+
function createSucceeded<T>(data: T): ActionResult<T>;
|
|
33
47
|
}
|
|
34
|
-
export {};
|
|
@@ -47,6 +47,7 @@ export declare class PromiseExtended<T, TCustomErrors extends Record<string, unk
|
|
|
47
47
|
static errored<T, TErrors extends Record<string, unknown>>(source: Error | Error[] | string): PromiseExtended<T, TErrors>;
|
|
48
48
|
onError(cb: Nullable<(data: PromiseExtended.ErrorData & TCustomErrors) => void>): this;
|
|
49
49
|
onSuccess(cb: Nullable<(data: T) => void>): this;
|
|
50
|
+
expectError<TName extends string, TError2 extends Error>(config: PromiseExtended.ErrorConfig<TName, TError2, TCustomErrors>): PromiseExtended<T, TCustomErrors & Record<TName, TError2>>;
|
|
50
51
|
expectError<TName extends string, TError2 extends Error>(name: TName, ErrCtor: new (...args: any[]) => TError2, processor?: (value: TError2) => void | Partial<TCustomErrors & Record<TName, TError2>>): PromiseExtended<T, TCustomErrors & Record<TName, TError2>>;
|
|
51
52
|
then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null, onrejected?: ((reason: unknown) => TResult2 | PromiseLike<TResult2>) | null): PromiseExtended<TResult1 | TResult2, TCustomErrors>;
|
|
52
53
|
catch<TResult = never>(onrejected?: ((reason: unknown) => TResult | PromiseLike<TResult>) | null): PromiseExtended<T | TResult, TCustomErrors>;
|
|
@@ -67,4 +68,12 @@ export declare namespace PromiseExtended {
|
|
|
67
68
|
error: string;
|
|
68
69
|
source: Error;
|
|
69
70
|
};
|
|
71
|
+
type ErrorConfig<TName extends string, TError2 extends Error, TPrevErrors> = {
|
|
72
|
+
name: TName;
|
|
73
|
+
ErrCtor: new (...args: any[]) => TError2;
|
|
74
|
+
processor?: (value: TError2) => void | Partial<TPrevErrors & Record<TName, TError2>>;
|
|
75
|
+
};
|
|
76
|
+
namespace ErrorConfig {
|
|
77
|
+
function createExpecter<TName extends string, TError2 extends Error>(config: Omit<ErrorConfig<TName, TError2, unknown>, 'processor'>): <T, TPrevErrors extends Record<string, unknown>>(promise: PromiseExtended<T, TPrevErrors>, processor?: (error: TError2) => void | Partial<TPrevErrors & Record<TName, TError2>>) => PromiseExtended<T, TPrevErrors & Record<TName, TError2>>;
|
|
78
|
+
}
|
|
70
79
|
}
|