@zajno/common 1.5.6 → 1.5.7
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/coverage/clover.xml +426 -344
- package/coverage/coverage-final.json +37 -36
- package/coverage/lcov-report/async/index.html +12 -7
- package/coverage/lcov-report/async/timeout.ts.html +24 -19
- package/coverage/lcov-report/block-navigation.js +8 -0
- package/coverage/lcov-report/disposer.ts.html +376 -0
- package/coverage/lcov-report/enumHelper.ts.html +454 -0
- package/coverage/lcov-report/favicon.png +0 -0
- package/coverage/lcov-report/index.html +54 -34
- package/coverage/lcov-report/logger/index.html +116 -0
- package/coverage/lcov-report/logger/index.ts.html +298 -0
- package/coverage/lcov-report/parallel.ts.html +388 -0
- package/coverage/lcov-report/queue/index.html +116 -0
- package/coverage/lcov-report/queue/parallel.ts.html +409 -0
- package/coverage/lcov-report/sort-arrow-sprite.png +0 -0
- package/coverage/lcov-report/sorter.js +26 -0
- package/coverage/lcov-report/src/__tests__/helpers/index.html +8 -3
- package/coverage/lcov-report/src/__tests__/helpers/main.ts.html +8 -3
- package/coverage/lcov-report/src/async/arrays.ts.html +15 -10
- package/coverage/lcov-report/src/async/index.html +13 -8
- package/coverage/lcov-report/src/async/timeout.ts.html +24 -19
- package/coverage/lcov-report/src/cache.ts.html +15 -10
- package/coverage/lcov-report/src/dates/calc.ts.html +10 -5
- package/coverage/lcov-report/src/dates/convert.ts.html +9 -4
- package/coverage/lcov-report/src/dates/datex.ts.html +8 -3
- package/coverage/lcov-report/src/dates/format.ts.html +10 -5
- package/coverage/lcov-report/src/dates/index.html +19 -14
- package/coverage/lcov-report/src/dates/index.ts.html +8 -3
- package/coverage/lcov-report/src/dates/parse.ts.html +9 -4
- package/coverage/lcov-report/src/dates/period.ts.html +8 -3
- package/coverage/lcov-report/src/dates/shift.ts.html +9 -4
- package/coverage/lcov-report/src/dates/types.ts.html +8 -3
- package/coverage/lcov-report/src/dates/yearDate.ts.html +10 -5
- package/coverage/lcov-report/src/disposer.ts.html +65 -21
- package/coverage/lcov-report/src/enumHelper.ts.html +12 -7
- package/coverage/lcov-report/src/event.ts.html +50 -21
- package/coverage/lcov-report/src/fields/index.html +12 -7
- package/coverage/lcov-report/src/fields/update.ts.html +12 -7
- package/coverage/lcov-report/src/functions.ts.html +10 -5
- package/coverage/lcov-report/src/index.html +52 -47
- package/coverage/lcov-report/src/lazy.light.ts.html +9 -4
- package/coverage/lcov-report/src/logger/batch.ts.html +9 -4
- package/coverage/lcov-report/src/logger/console.ts.html +16 -11
- package/coverage/lcov-report/src/logger/index.html +13 -8
- package/coverage/lcov-report/src/logger/index.ts.html +38 -33
- package/coverage/lcov-report/src/logger/named.ts.html +26 -21
- package/coverage/lcov-report/src/logger/proxy.ts.html +20 -15
- package/coverage/lcov-report/src/math/arrays.ts.html +33 -28
- package/coverage/lcov-report/src/math/calc.ts.html +18 -13
- package/coverage/lcov-report/src/math/distribution.ts.html +10 -5
- package/coverage/lcov-report/src/math/index.html +16 -11
- package/coverage/lcov-report/src/math/index.ts.html +14 -9
- package/coverage/lcov-report/src/observersMap.ts.html +12 -7
- package/coverage/lcov-report/src/observingCache.ts.html +12 -7
- package/coverage/lcov-report/src/queue/index.html +116 -0
- package/coverage/lcov-report/src/queue/parallel.ts.html +499 -0
- package/coverage/lcov-report/src/tempoCache.ts.html +9 -4
- package/coverage/lcov-report/src/transitionObserver.ts.html +14 -9
- package/coverage/lcov-report/src/types.ts.html +13 -8
- package/coverage/lcov-report/src/validation/ValidationErrors.ts.html +8 -3
- package/coverage/lcov-report/src/validation/creditCard.ts.html +8 -3
- package/coverage/lcov-report/src/validation/helpers.ts.html +13 -8
- package/coverage/lcov-report/src/validation/index.html +11 -6
- package/coverage/lcov-report/src/validation/index.ts.html +8 -3
- package/coverage/lcov-report/src/validation/types.ts.html +8 -3
- package/coverage/lcov-report/src/validation/validators.ts.html +8 -3
- package/coverage/lcov-report/src/validation/wrappers.ts.html +8 -3
- package/coverage/lcov-report/src/viewModels/CommonModel.ts.html +10 -5
- package/coverage/lcov-report/src/viewModels/FlagModel.ts.html +8 -3
- package/coverage/lcov-report/src/viewModels/LoadingModel.ts.html +10 -5
- package/coverage/lcov-report/src/viewModels/MultiSelectModel.ts.html +13 -8
- package/coverage/lcov-report/src/viewModels/NumberModel.ts.html +8 -3
- package/coverage/lcov-report/src/viewModels/SelectModel.ts.html +10 -5
- package/coverage/lcov-report/src/viewModels/TextModel.ts.html +13 -8
- package/coverage/lcov-report/src/viewModels/Validatable.ts.html +12 -7
- package/coverage/lcov-report/src/viewModels/index.html +22 -17
- package/coverage/lcov-report/src/viewModels/wrappers.ts.html +8 -3
- package/coverage/lcov.info +487 -458
- package/lib/async/arrays.extend.js +4 -4
- package/lib/async/arrays.extend.js.map +1 -1
- package/lib/cache.js +6 -6
- package/lib/cache.js.map +1 -1
- package/lib/dates/calc.js +7 -7
- package/lib/dates/calc.js.map +1 -1
- package/lib/dates/convert.js +11 -11
- package/lib/dates/convert.js.map +1 -1
- package/lib/dates/format.js +6 -6
- package/lib/dates/format.js.map +1 -1
- package/lib/dates/period.js +2 -2
- package/lib/dates/period.js.map +1 -1
- package/lib/dates/shift.js +5 -5
- package/lib/dates/shift.js.map +1 -1
- package/lib/dates/yearDate.js +2 -2
- package/lib/dates/yearDate.js.map +1 -1
- package/lib/disposer.d.ts +4 -2
- package/lib/disposer.d.ts.map +1 -1
- package/lib/disposer.js +10 -5
- package/lib/disposer.js.map +1 -1
- package/lib/enumHelper.d.ts +2 -2
- package/lib/enumHelper.d.ts.map +1 -1
- package/lib/enumHelper.js.map +1 -1
- package/lib/event.d.ts.map +1 -1
- package/lib/event.js +8 -2
- package/lib/event.js.map +1 -1
- package/lib/fields/update.js +2 -2
- package/lib/fields/update.js.map +1 -1
- package/lib/lazy.js +2 -2
- package/lib/lazy.js.map +1 -1
- package/lib/logger/file.js.map +1 -1
- package/lib/logger/index.d.ts +1 -1
- package/lib/logger/index.d.ts.map +1 -1
- package/lib/logger/index.js +1 -1
- package/lib/logger/index.js.map +1 -1
- package/lib/math/arrays.js +2 -2
- package/lib/math/arrays.js.map +1 -1
- package/lib/models/EntityWithStatus.js.map +1 -1
- package/lib/observersMap.js +2 -2
- package/lib/observersMap.js.map +1 -1
- package/lib/observingCache.js +1 -1
- package/lib/observingCache.js.map +1 -1
- package/lib/pool.js +1 -1
- package/lib/pool.js.map +1 -1
- package/lib/queue/parallel.d.ts +22 -0
- package/lib/queue/parallel.d.ts.map +1 -0
- package/lib/queue/parallel.js +117 -0
- package/lib/queue/parallel.js.map +1 -0
- package/lib/services/localization/LocalizationManager.js +1 -1
- package/lib/services/localization/LocalizationManager.js.map +1 -1
- package/lib/services/storage/web/localStorage.js +1 -1
- package/lib/services/storage/web/localStorage.js.map +1 -1
- package/lib/services/storage/web/sessionStorage.js +1 -1
- package/lib/services/storage/web/sessionStorage.js.map +1 -1
- package/lib/transitionObserver.js +3 -3
- package/lib/transitionObserver.js.map +1 -1
- package/lib/validation/wrappers.js +1 -1
- package/lib/validation/wrappers.js.map +1 -1
- package/lib/viewModels/CommonModel.js +1 -1
- package/lib/viewModels/CommonModel.js.map +1 -1
- package/lib/viewModels/FlagModel.js +1 -1
- package/lib/viewModels/FlagModel.js.map +1 -1
- package/lib/viewModels/MultiSelectModel.js +5 -5
- package/lib/viewModels/MultiSelectModel.js.map +1 -1
- package/lib/viewModels/NumberModel.js +1 -1
- package/lib/viewModels/NumberModel.js.map +1 -1
- package/lib/viewModels/PromptModal.js +1 -1
- package/lib/viewModels/PromptModal.js.map +1 -1
- package/lib/viewModels/SelectModel.js +4 -4
- package/lib/viewModels/SelectModel.js.map +1 -1
- package/lib/viewModels/TextModel.js +3 -3
- package/lib/viewModels/TextModel.js.map +1 -1
- package/lib/viewModels/Validatable.js +3 -3
- package/lib/viewModels/Validatable.js.map +1 -1
- package/lib/viewModels/ValueModel.js +1 -1
- package/lib/viewModels/ValueModel.js.map +1 -1
- package/package.json +10 -11
- package/src/.DS_Store +0 -0
- package/src/disposer.ts +19 -6
- package/src/enumHelper.ts +2 -2
- package/src/event.ts +8 -0
- package/src/queue/__tests__/parallel.test.ts +57 -0
- package/src/queue/parallel.ts +138 -0
- package/src/services/storage/web/localStorage.ts +1 -1
- package/src/services/storage/web/sessionStorage.ts +1 -1
- package/yarn.lock +1066 -1441
|
@@ -16,7 +16,7 @@ class MultiSelect extends Validatable_1.ValidatableModel {
|
|
|
16
16
|
this._indexes = new Set();
|
|
17
17
|
this.opened = new FlagModel_1.FlagModel();
|
|
18
18
|
this._initial = null;
|
|
19
|
-
this._flags = lazy_light_1.createLazy(() => this.createFlags());
|
|
19
|
+
this._flags = (0, lazy_light_1.createLazy)(() => this.createFlags());
|
|
20
20
|
this._indexesLocked = false;
|
|
21
21
|
this.setItemSelected = (item, selected) => {
|
|
22
22
|
const i = this.items.indexOf(item);
|
|
@@ -73,7 +73,7 @@ class MultiSelect extends Validatable_1.ValidatableModel {
|
|
|
73
73
|
super.reset();
|
|
74
74
|
this.setInitialIndexes();
|
|
75
75
|
};
|
|
76
|
-
mobx_1.makeObservable(this, {
|
|
76
|
+
(0, mobx_1.makeObservable)(this, {
|
|
77
77
|
'_indexes': mobx_1.observable,
|
|
78
78
|
selectedIndexes: mobx_1.computed,
|
|
79
79
|
values: mobx_1.computed,
|
|
@@ -112,7 +112,7 @@ class MultiSelect extends Validatable_1.ValidatableModel {
|
|
|
112
112
|
get selectedCount() { return this._indexes.size; }
|
|
113
113
|
get isEmpty() { return this.selectedCount === 0; }
|
|
114
114
|
// @computed
|
|
115
|
-
get isDefault() { var _a; return ((_a = math_1.arraysCompareDistinct(this.selectedIndexes, this._initial)) === null || _a === void 0 ? void 0 : _a.diff) === 0; }
|
|
115
|
+
get isDefault() { var _a; return ((_a = (0, math_1.arraysCompareDistinct)(this.selectedIndexes, this._initial)) === null || _a === void 0 ? void 0 : _a.diff) === 0; }
|
|
116
116
|
get valueToValidate() { return this.selectedItems; }
|
|
117
117
|
setInitialIndexes() {
|
|
118
118
|
this._indexes.clear();
|
|
@@ -124,9 +124,9 @@ class MultiSelect extends Validatable_1.ValidatableModel {
|
|
|
124
124
|
createFlags() {
|
|
125
125
|
const flags = this._items
|
|
126
126
|
.map((item, index) => {
|
|
127
|
-
const flag = wrappers_1.withLabel(new FlagModel_1.FlagModel(this._indexes.has(index)), () => this._accessor(item));
|
|
127
|
+
const flag = (0, wrappers_1.withLabel)(new FlagModel_1.FlagModel(this._indexes.has(index)), () => this._accessor(item));
|
|
128
128
|
// react on every flag is changed directly
|
|
129
|
-
mobx_1.reaction(() => flag.value, isSelected => {
|
|
129
|
+
(0, mobx_1.reaction)(() => flag.value, isSelected => {
|
|
130
130
|
this.setIndexSelected(index, isSelected);
|
|
131
131
|
});
|
|
132
132
|
return flag;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiSelectModel.js","sourceRoot":"","sources":["../../src/viewModels/MultiSelectModel.ts"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,+BAA8E;AAC9E,2CAA2D;AAC3D,+CAAiD;AAEjD,yCAAuC;AAEvC,kCAAgD;AAEhD,MAAa,WAAqB,SAAQ,8BAAkC;IAWxE,YACqB,MAAoB,EACpB,SAA8B,EAC/C,GAAG,QAAkB;QAErB,KAAK,EAAE,CAAC;QAJS,WAAM,GAAN,MAAM,CAAc;QACpB,cAAS,GAAT,SAAS,CAAqB;QAXnD,cAAc;QACG,aAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;QAE9B,WAAM,GAAG,IAAI,qBAAS,EAAE,CAAC;QACxB,aAAQ,GAAa,IAAI,CAAC;QAE1B,WAAM,GAAG,uBAAU,
|
|
1
|
+
{"version":3,"file":"MultiSelectModel.js","sourceRoot":"","sources":["../../src/viewModels/MultiSelectModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ class NumberModel {
|
|
|
19
19
|
this.increment = (d = 1) => this.value += d;
|
|
20
20
|
// @action
|
|
21
21
|
this.decrement = (d = 1) => this.value -= d;
|
|
22
|
-
mobx_1.makeObservable(this, {
|
|
22
|
+
(0, mobx_1.makeObservable)(this, {
|
|
23
23
|
_value: mobx_1.observable,
|
|
24
24
|
setValue: mobx_1.action,
|
|
25
25
|
reset: mobx_1.action,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NumberModel.js","sourceRoot":"","sources":["../../src/viewModels/NumberModel.ts"],"names":[],"mappings":";;;AAAA,+BAA0D;AAQ1D,MAAa,WAAW;IAOpB,YAAY,UAAkB,CAAC;QAL/B,cAAc;QACN,WAAM,GAAW,CAAC,CAAC;QAEnB,aAAQ,GAAW,CAAC,CAAC;QAiB7B,UAAU;QACM,aAAQ,GAAG,CAAC,CAAS,EAAE,EAAE;YACrC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QACpB,CAAC,CAAC;QAIF,UAAU;QACV,UAAK,GAAG,GAAG,EAAE;YACT,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QAChC,CAAC,CAAC;QAEF,UAAU;QACV,cAAS,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAEvC,UAAU;QACV,cAAS,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QA9BnC,qBAAc,
|
|
1
|
+
{"version":3,"file":"NumberModel.js","sourceRoot":"","sources":["../../src/viewModels/NumberModel.ts"],"names":[],"mappings":";;;AAAA,+BAA0D;AAQ1D,MAAa,WAAW;IAOpB,YAAY,UAAkB,CAAC;QAL/B,cAAc;QACN,WAAM,GAAW,CAAC,CAAC;QAEnB,aAAQ,GAAW,CAAC,CAAC;QAiB7B,UAAU;QACM,aAAQ,GAAG,CAAC,CAAS,EAAE,EAAE;YACrC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QACpB,CAAC,CAAC;QAIF,UAAU;QACV,UAAK,GAAG,GAAG,EAAE;YACT,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QAChC,CAAC,CAAC;QAEF,UAAU;QACV,cAAS,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAEvC,UAAU;QACV,cAAS,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QA9BnC,IAAA,qBAAc,EAAwB,IAAI,EAAE;YACxC,MAAM,EAAE,iBAAU;YAClB,QAAQ,EAAE,aAAM;YAChB,KAAK,EAAE,aAAM;YACb,SAAS,EAAE,aAAM;YACjB,SAAS,EAAE,aAAM;SACpB,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;IAChC,CAAC;IAED,IAAI,KAAK,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACnC,IAAI,KAAK,CAAC,CAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAO1C,IAAI,SAAS,KAAK,OAAO,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;CAY5D;AAvCD,kCAuCC;AAED,kBAAe,WAAW,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PromptModal.js","sourceRoot":"","sources":["../../src/viewModels/PromptModal.ts"],"names":[],"mappings":";;;;AAAA,+BAA0D;AAC1D,2CAAwC;AAOxC,MAAa,gBAAgB;IAMzB;QALgB,aAAQ,GAAG,IAAI,qBAAS,EAAE,CAAC;QAGnC,mBAAc,GAAM,IAAI,CAAC;QAS1B,cAAS,GAAG,CAAC,MAAS,EAAE,EAAE;YAC7B,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC;QAC/B,CAAC,CAAC;QAGK,eAAU,GAAG,GAAG,EAAE;YACrB,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;YAC5B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC/B,CAAC,CAAC;QAEQ,cAAS,GAAG,KAAK,EAAE,EAA8B,EAAE,KAAK,GAAG,IAAI,EAAE,WAAW,GAAG,KAAK,EAAE,EAAE;YAC9F,IAAI,EAAE,EAAE;gBACJ,MAAM,OAAO,GAAG,EAAE,EAAE,CAAC;gBACrB,IAAI,WAAW,EAAE;oBACb,MAAM,OAAO,CAAC;iBACjB;aACJ;YAED,IAAI,KAAK,EAAE;gBACP,IAAI,CAAC,UAAU,EAAE,CAAC;aACrB;QACL,CAAC,CAAC;QA5BE,qBAAc,
|
|
1
|
+
{"version":3,"file":"PromptModal.js","sourceRoot":"","sources":["../../src/viewModels/PromptModal.ts"],"names":[],"mappings":";;;;AAAA,+BAA0D;AAC1D,2CAAwC;AAOxC,MAAa,gBAAgB;IAMzB;QALgB,aAAQ,GAAG,IAAI,qBAAS,EAAE,CAAC;QAGnC,mBAAc,GAAM,IAAI,CAAC;QAS1B,cAAS,GAAG,CAAC,MAAS,EAAE,EAAE;YAC7B,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC;QAC/B,CAAC,CAAC;QAGK,eAAU,GAAG,GAAG,EAAE;YACrB,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;YAC5B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC/B,CAAC,CAAC;QAEQ,cAAS,GAAG,KAAK,EAAE,EAA8B,EAAE,KAAK,GAAG,IAAI,EAAE,WAAW,GAAG,KAAK,EAAE,EAAE;YAC9F,IAAI,EAAE,EAAE;gBACJ,MAAM,OAAO,GAAG,EAAE,EAAE,CAAC;gBACrB,IAAI,WAAW,EAAE;oBACb,MAAM,OAAO,CAAC;iBACjB;aACJ;YAED,IAAI,KAAK,EAAE;gBACP,IAAI,CAAC,UAAU,EAAE,CAAC;aACrB;QACL,CAAC,CAAC;QA5BE,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,aAAa,KAAK,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;CA0BtD;AAhCG;IADC,iBAAU,CAAC,GAAG;;wDACkB;AASjC;IADC,aAAM;;mDAIL;AAGF;IADC,aAAM;;oDAIL;AAtBN,4CAoCC;AAaD,MAAa,oBAAqB,SAAQ,gBAAmC;IAA7E;;QAKI,cAAS,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QACtG,aAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IACxG,CAAC;IANG,IAAI,YAAY,KAAK,OAAO,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;IAE9D,IAAI,WAAW,KAAK,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC;CAI/D;AAPD,oDAOC"}
|
|
@@ -15,7 +15,7 @@ class Select extends Validatable_1.ValidatableModel {
|
|
|
15
15
|
this._index = undefined;
|
|
16
16
|
this._indexLocked = false;
|
|
17
17
|
this._initialIndex = null;
|
|
18
|
-
this._flags = lazy_light_1.createLazy(() => this.createFlags());
|
|
18
|
+
this._flags = (0, lazy_light_1.createLazy)(() => this.createFlags());
|
|
19
19
|
this.opened = new FlagModel_1.FlagModel();
|
|
20
20
|
// @action
|
|
21
21
|
this.setIndex = (val) => {
|
|
@@ -42,7 +42,7 @@ class Select extends Validatable_1.ValidatableModel {
|
|
|
42
42
|
this.index = this._initialIndex;
|
|
43
43
|
};
|
|
44
44
|
this._items = items;
|
|
45
|
-
mobx_1.makeObservable(this, {
|
|
45
|
+
(0, mobx_1.makeObservable)(this, {
|
|
46
46
|
'_index': mobx_1.observable,
|
|
47
47
|
'_items': mobx_1.observable.ref,
|
|
48
48
|
values: mobx_1.computed,
|
|
@@ -96,9 +96,9 @@ class Select extends Validatable_1.ValidatableModel {
|
|
|
96
96
|
createFlags() {
|
|
97
97
|
const flags = this.items
|
|
98
98
|
.map((item, index) => {
|
|
99
|
-
const flag = wrappers_1.withLabel(new FlagModel_1.FlagModel(index === this.index), () => this._accessor(item));
|
|
99
|
+
const flag = (0, wrappers_1.withLabel)(new FlagModel_1.FlagModel(index === this.index), () => this._accessor(item));
|
|
100
100
|
// react on every flag is changed directly
|
|
101
|
-
mobx_1.reaction(() => flag.value, isSelected => {
|
|
101
|
+
(0, mobx_1.reaction)(() => flag.value, isSelected => {
|
|
102
102
|
if (isSelected) {
|
|
103
103
|
this.index = index;
|
|
104
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectModel.js","sourceRoot":"","sources":["../../src/viewModels/SelectModel.ts"],"names":[],"mappings":";;;AAAA,+BAA8E;AAC9E,8CAA2C;AAC3C,2CAA2D;AAC3D,+CAAiD;AAEjD,yCAAuC;AAEvC,oCAAkC;AAElC,MAAa,MAAgB,SAAQ,8BAAmB;IAapD,YACI,KAA2B,EACV,SAA8B,EAC/C,eAAuB,CAAC;QAExB,KAAK,EAAE,CAAC;QAHS,cAAS,GAAT,SAAS,CAAqB;QAdnD,cAAc;QACN,WAAM,GAAW,SAAS,CAAC;QAI3B,iBAAY,GAAG,KAAK,CAAC;QACrB,kBAAa,GAAW,IAAI,CAAC;QAEpB,WAAM,GAAG,uBAAU,
|
|
1
|
+
{"version":3,"file":"SelectModel.js","sourceRoot":"","sources":["../../src/viewModels/SelectModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,12 +11,12 @@ function FromGetter(getter, setter, autorunDelay = null, noAutorun = null) {
|
|
|
11
11
|
setter(types_1.Getter.getValue(getter));
|
|
12
12
|
return null;
|
|
13
13
|
}
|
|
14
|
-
return mobx_1.reaction(() => types_1.Getter.getValue(getter), setter, { delay: autorunDelay, fireImmediately: true });
|
|
14
|
+
return (0, mobx_1.reaction)(() => types_1.Getter.getValue(getter), setter, { delay: autorunDelay, fireImmediately: true });
|
|
15
15
|
}
|
|
16
16
|
class Text {
|
|
17
17
|
constructor(config) {
|
|
18
18
|
this._value = null;
|
|
19
|
-
mobx_1.makeObservable(this);
|
|
19
|
+
(0, mobx_1.makeObservable)(this);
|
|
20
20
|
FromGetter(config.value, val => this._value = val, config.async ? 100 : null, config.noSubscribe);
|
|
21
21
|
}
|
|
22
22
|
get value() { return this._value; }
|
|
@@ -62,7 +62,7 @@ class TextInputVM extends Validatable_1.ValidatableModel {
|
|
|
62
62
|
this._focused = false;
|
|
63
63
|
super.reset();
|
|
64
64
|
};
|
|
65
|
-
mobx_1.makeObservable(this, {
|
|
65
|
+
(0, mobx_1.makeObservable)(this, {
|
|
66
66
|
_value: mobx_1.observable,
|
|
67
67
|
_focused: mobx_1.observable,
|
|
68
68
|
setValue: mobx_1.action,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextModel.js","sourceRoot":"","sources":["../../src/viewModels/TextModel.ts"],"names":[],"mappings":";;;;AAAA,+BAAoE;AACpE,oCAAkC;AAElC,+DAA+B;AAC/B,+CAAiD;AAYjD,SAAS,UAAU,CAAC,MAAsB,EAAE,MAA6B,EAAE,eAAuB,IAAI,EAAE,YAAqB,IAAI;IAC7H,IAAI,SAAS,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE;QAC3C,MAAM,CAAC,cAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;KACf;IAED,OAAO,eAAQ,
|
|
1
|
+
{"version":3,"file":"TextModel.js","sourceRoot":"","sources":["../../src/viewModels/TextModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ class ValidatableModel {
|
|
|
13
13
|
this._error = null;
|
|
14
14
|
this._validationError = null;
|
|
15
15
|
this._validateOnChange = false;
|
|
16
|
-
mobx_1.makeObservable(this, {
|
|
16
|
+
(0, mobx_1.makeObservable)(this, {
|
|
17
17
|
'_error': mobx_1.observable,
|
|
18
18
|
reset: mobx_1.action,
|
|
19
19
|
});
|
|
@@ -49,7 +49,7 @@ class ValidatableModel {
|
|
|
49
49
|
catch (err) {
|
|
50
50
|
this._validationError = err;
|
|
51
51
|
}
|
|
52
|
-
mobx_1.runInAction(() => {
|
|
52
|
+
(0, mobx_1.runInAction)(() => {
|
|
53
53
|
if (!this._validationError) {
|
|
54
54
|
this._error = null;
|
|
55
55
|
}
|
|
@@ -71,7 +71,7 @@ class ValidatableModel {
|
|
|
71
71
|
}
|
|
72
72
|
static async IsSomeInvalid(validatables, stopOnFail = true) {
|
|
73
73
|
if (stopOnFail) {
|
|
74
|
-
return arrays_1.someAsync(validatables, async (v) => !(await v.validate()));
|
|
74
|
+
return (0, arrays_1.someAsync)(validatables, async (v) => !(await v.validate()));
|
|
75
75
|
}
|
|
76
76
|
const results = await Promise.all(validatables.map(v => v.validate()));
|
|
77
77
|
return results.some(r => !r);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validatable.js","sourceRoot":"","sources":["../../src/viewModels/Validatable.ts"],"names":[],"mappings":";;;AAAA,+BAAuE;AACvE,8CAA6G;AAC7G,4CAA4C;AAU5C,MAAM,cAAc,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;AAE/B,MAAsB,gBAAgB;IAWlC;QATQ,eAAU,GAAyC,IAAI,CAAC;QACxD,aAAQ,GAAiC,IAAI,CAAC;QAEtD,cAAc;QACN,WAAM,GAAW,IAAI,CAAC;QAEtB,qBAAgB,GAAoB,IAAI,CAAC;QACvC,sBAAiB,GAAG,KAAK,CAAC;QAGhC,qBAAc,
|
|
1
|
+
{"version":3,"file":"Validatable.js","sourceRoot":"","sources":["../../src/viewModels/Validatable.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ class ValueModel {
|
|
|
15
15
|
};
|
|
16
16
|
this._value = types_1.Getter.getValue(v) || null;
|
|
17
17
|
this._defaultValue = v;
|
|
18
|
-
mobx_1.makeObservable(this, {
|
|
18
|
+
(0, mobx_1.makeObservable)(this, {
|
|
19
19
|
_value: useRefObservable ? mobx_1.observable.ref : mobx_1.observable,
|
|
20
20
|
setValue: mobx_1.action,
|
|
21
21
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValueModel.js","sourceRoot":"","sources":["../../src/viewModels/ValueModel.ts"],"names":[],"mappings":";;;AAAA,+BAA0D;AAC1D,oCAAkC;AAGlC,MAAa,UAAU;IAMnB,YAAY,IAAe,IAAI,EAAE,gBAAgB,GAAG,IAAI;QAFhD,kBAAa,GAAc,IAAI,CAAC;QAiBxC,SAAS;QACO,aAAQ,GAAG,CAAC,KAAQ,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACxB,CAAC,CAAC;QAEF,UAAK,GAAG,GAAG,EAAE;YACT,IAAI,CAAC,MAAM,GAAG,cAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACtD,CAAC,CAAC;QArBE,IAAI,CAAC,MAAM,GAAG,cAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QAEvB,qBAAc,
|
|
1
|
+
{"version":3,"file":"ValueModel.js","sourceRoot":"","sources":["../../src/viewModels/ValueModel.ts"],"names":[],"mappings":";;;AAAA,+BAA0D;AAC1D,oCAAkC;AAGlC,MAAa,UAAU;IAMnB,YAAY,IAAe,IAAI,EAAE,gBAAgB,GAAG,IAAI;QAFhD,kBAAa,GAAc,IAAI,CAAC;QAiBxC,SAAS;QACO,aAAQ,GAAG,CAAC,KAAQ,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACxB,CAAC,CAAC;QAEF,UAAK,GAAG,GAAG,EAAE;YACT,IAAI,CAAC,MAAM,GAAG,cAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACtD,CAAC,CAAC;QArBE,IAAI,CAAC,MAAM,GAAG,cAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QAEvB,IAAA,qBAAc,EAA0B,IAAI,EAAE;YAC1C,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,iBAAU,CAAC,GAAG,CAAC,CAAC,CAAC,iBAAU;YACtD,QAAQ,EAAE,aAAM;SACnB,CAAC,CAAC;IACP,CAAC;IAED,IAAW,KAAK,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1C,IAAW,KAAK,CAAC,CAAI;QACjB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;CAUJ;AA7BD,gCA6BC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zajno/common",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.7",
|
|
4
4
|
"description": "Zajno's re-usable utilities for JS/TS projects",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -26,19 +26,18 @@
|
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"@types/faker": "^5.5.9",
|
|
29
|
-
"@types/jest": "^
|
|
29
|
+
"@types/jest": "^28.1.6",
|
|
30
30
|
"@types/node": "^16.11.3",
|
|
31
|
-
"@zajno/eslint-config": "^2.
|
|
32
|
-
"eslint": "^8.0
|
|
31
|
+
"@zajno/eslint-config": "^2.1.0",
|
|
32
|
+
"eslint": "^8.20.0",
|
|
33
33
|
"faker": "^5.5.3",
|
|
34
34
|
"fast-check": "^2.18.0",
|
|
35
|
-
"jest": "^
|
|
36
|
-
"mobx": "^6",
|
|
37
|
-
"ts-jest": "^
|
|
38
|
-
"ts-node": "^10.
|
|
39
|
-
"tslib": "^2.
|
|
40
|
-
"
|
|
41
|
-
"typescript": "4"
|
|
35
|
+
"jest": "^28.1.3",
|
|
36
|
+
"mobx": "^6.6.1",
|
|
37
|
+
"ts-jest": "^28.0.7",
|
|
38
|
+
"ts-node": "^10.9.1",
|
|
39
|
+
"tslib": "^2.4.0",
|
|
40
|
+
"typescript": "^4.7.4"
|
|
42
41
|
},
|
|
43
42
|
"peerDependencies": {
|
|
44
43
|
"mobx": "^6",
|
package/src/.DS_Store
ADDED
|
Binary file
|
package/src/disposer.ts
CHANGED
|
@@ -13,9 +13,18 @@ export class Disposer {
|
|
|
13
13
|
private readonly _disposers: DisposeFunction[] = [];
|
|
14
14
|
private readonly _map = new Map<string, DisposeFunction>();
|
|
15
15
|
|
|
16
|
-
|
|
16
|
+
private _loggerName: string = null;
|
|
17
17
|
|
|
18
|
-
|
|
18
|
+
constructor(loggerName: string = null) {
|
|
19
|
+
this._loggerName = loggerName;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
public setLoggerName(loggerName: string) {
|
|
23
|
+
this._loggerName = loggerName;
|
|
24
|
+
return this;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
public add(d: DisposeFunction | IDisposable, id?: string) {
|
|
19
28
|
if (!d) {
|
|
20
29
|
return;
|
|
21
30
|
}
|
|
@@ -36,7 +45,7 @@ export class Disposer {
|
|
|
36
45
|
}
|
|
37
46
|
}
|
|
38
47
|
|
|
39
|
-
execute(id: string) {
|
|
48
|
+
public execute(id: string) {
|
|
40
49
|
const d = this._map.get(id);
|
|
41
50
|
if (!d) {
|
|
42
51
|
return;
|
|
@@ -51,10 +60,10 @@ export class Disposer {
|
|
|
51
60
|
d();
|
|
52
61
|
}
|
|
53
62
|
|
|
54
|
-
dispose(log = false) {
|
|
63
|
+
public dispose(log = false) {
|
|
55
64
|
if (log) {
|
|
56
65
|
logger.log(
|
|
57
|
-
`[Disposer:${this.
|
|
66
|
+
`[Disposer:${this._loggerName || '<unknown>'}] Disposing ${this._disposers.length} items including named ones:`,
|
|
58
67
|
Array.from(this._map.entries()).map(e => e[0]),
|
|
59
68
|
);
|
|
60
69
|
}
|
|
@@ -74,9 +83,13 @@ export function combineDisposers(...items: DisposeFunction[]): DisposeFunction {
|
|
|
74
83
|
|
|
75
84
|
export class Disposable implements IDisposable {
|
|
76
85
|
|
|
77
|
-
protected readonly disposer
|
|
86
|
+
protected readonly disposer: Disposer;
|
|
78
87
|
protected _isDisposed = false;
|
|
79
88
|
|
|
89
|
+
constructor(loggerName: string = null) {
|
|
90
|
+
this.disposer = new Disposer(loggerName);
|
|
91
|
+
}
|
|
92
|
+
|
|
80
93
|
public dispose = () => {
|
|
81
94
|
this._isDisposed = true;
|
|
82
95
|
this.disposer.dispose();
|
package/src/enumHelper.ts
CHANGED
|
@@ -23,7 +23,7 @@ export class EnumStringHelper<T extends string> {
|
|
|
23
23
|
return custom || v;
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
-
validateValue(v: string): T | null {
|
|
26
|
+
validateValue(v: string | null): T | null {
|
|
27
27
|
if (!v) {
|
|
28
28
|
return null;
|
|
29
29
|
}
|
|
@@ -68,7 +68,7 @@ export default class EnumHelper<T extends number> {
|
|
|
68
68
|
return custom || this._obj[v];
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
-
validateValue(v: number): T | null {
|
|
71
|
+
validateValue(v: number | null): T | null {
|
|
72
72
|
if (v == null || Number.isNaN(v)) {
|
|
73
73
|
return null;
|
|
74
74
|
}
|
package/src/event.ts
CHANGED
|
@@ -35,6 +35,10 @@ export class Event<T = any> implements IEvent<T> {
|
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
public trigger(data?: T) {
|
|
38
|
+
if (!this._handlers.length) {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
|
|
38
42
|
const hh = this._handlers.slice(0);
|
|
39
43
|
hh.forEach(cb => {
|
|
40
44
|
try {
|
|
@@ -46,6 +50,10 @@ export class Event<T = any> implements IEvent<T> {
|
|
|
46
50
|
}
|
|
47
51
|
|
|
48
52
|
public async triggerAsync(data?: T): Promise<Error[]> {
|
|
53
|
+
if (!this._handlers.length) {
|
|
54
|
+
return [];
|
|
55
|
+
}
|
|
56
|
+
|
|
49
57
|
const hh = this._handlers.slice(0);
|
|
50
58
|
|
|
51
59
|
const errors: Error[] = [];
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { ParallelQueue } from '../parallel';
|
|
2
|
+
import { setTimeoutAsync } from '../../async/timeout';
|
|
3
|
+
import { setMode } from '../../logger';
|
|
4
|
+
|
|
5
|
+
const createLoader = () => jest.fn(() => setTimeoutAsync(100));
|
|
6
|
+
|
|
7
|
+
setMode('console');
|
|
8
|
+
|
|
9
|
+
describe('ParallelQueue', () => {
|
|
10
|
+
it('runs', async () => {
|
|
11
|
+
|
|
12
|
+
const q = new ParallelQueue()
|
|
13
|
+
.withLogger('test');
|
|
14
|
+
|
|
15
|
+
expect(q.inProgress).toBeFalsy();
|
|
16
|
+
|
|
17
|
+
const f1 = createLoader();
|
|
18
|
+
const f2 = createLoader();
|
|
19
|
+
q.enqueue(f1);
|
|
20
|
+
q.enqueue(f2);
|
|
21
|
+
|
|
22
|
+
expect(f1).not.toHaveBeenCalled();
|
|
23
|
+
expect(f2).not.toHaveBeenCalled();
|
|
24
|
+
|
|
25
|
+
const res = q.start();
|
|
26
|
+
expect(q.inProgress).toBeTruthy();
|
|
27
|
+
|
|
28
|
+
expect(q.currentoPriority).toBe(0);
|
|
29
|
+
|
|
30
|
+
const f3 = createLoader();
|
|
31
|
+
const f4 = createLoader();
|
|
32
|
+
|
|
33
|
+
q.enqueue(f3);
|
|
34
|
+
|
|
35
|
+
q.enqueue(f4, 1);
|
|
36
|
+
|
|
37
|
+
await expect(q.start()).resolves.toBeUndefined();
|
|
38
|
+
|
|
39
|
+
await expect(res).resolves.toBe(true);
|
|
40
|
+
|
|
41
|
+
expect(q.inProgress).toBeFalsy();
|
|
42
|
+
expect(q.currentoPriority).toBe(1);
|
|
43
|
+
|
|
44
|
+
expect(f1).toHaveBeenCalled();
|
|
45
|
+
expect(f2).toHaveBeenCalled();
|
|
46
|
+
expect(f3).toHaveBeenCalled();
|
|
47
|
+
expect(f4).toHaveBeenCalled();
|
|
48
|
+
|
|
49
|
+
const f5 = createLoader();
|
|
50
|
+
|
|
51
|
+
q.enqueue(f5);
|
|
52
|
+
|
|
53
|
+
await setTimeoutAsync(100);
|
|
54
|
+
|
|
55
|
+
expect(f5).toHaveBeenCalled();
|
|
56
|
+
});
|
|
57
|
+
});
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
import { createLogger, ILogger } from '../logger';
|
|
2
|
+
import { Event } from '../event';
|
|
3
|
+
|
|
4
|
+
export type QueueItem = () => void | Promise<void>;
|
|
5
|
+
|
|
6
|
+
type Queue = QueueItem[];
|
|
7
|
+
|
|
8
|
+
export class ParallelQueue {
|
|
9
|
+
|
|
10
|
+
private readonly _queues: Record<number, Queue> = { };
|
|
11
|
+
|
|
12
|
+
private _inProgress: boolean = null;
|
|
13
|
+
private _currentIndex = 0;
|
|
14
|
+
private _maxIndex = 0;
|
|
15
|
+
|
|
16
|
+
private _logger: ILogger = null;
|
|
17
|
+
|
|
18
|
+
private readonly _beforePriorityRun = new Event<number>();
|
|
19
|
+
private readonly _afterPriorityRun = new Event<number>();
|
|
20
|
+
|
|
21
|
+
public get currentoPriority() { return this._currentIndex; }
|
|
22
|
+
public get inProgress() { return this._inProgress; }
|
|
23
|
+
|
|
24
|
+
public get beforePriorityRun() { return this._beforePriorityRun.expose(); }
|
|
25
|
+
public get afterPriorityRun() { return this._afterPriorityRun.expose(); }
|
|
26
|
+
|
|
27
|
+
public withLogger(name?: string) {
|
|
28
|
+
this._logger = createLogger(`[Queue:${name || '?'}]`);
|
|
29
|
+
return this;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/** @returns A callback that will try to cancel queued item */
|
|
33
|
+
public enqueue(cb: QueueItem, priority?: number): () => void {
|
|
34
|
+
const p = Math.round(priority || 0);
|
|
35
|
+
|
|
36
|
+
// if it's started and the priority has been processing already
|
|
37
|
+
// or it has just finished
|
|
38
|
+
if (this._inProgress && p <= this._currentIndex || this._inProgress === false) {
|
|
39
|
+
// just start the loader
|
|
40
|
+
this._executeLoader(cb, p, 1000);
|
|
41
|
+
return () => false;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
// Enqueue for future execution
|
|
45
|
+
const q = this.getQueue(p);
|
|
46
|
+
q.push(cb);
|
|
47
|
+
this._maxIndex = Math.max(this._maxIndex, p);
|
|
48
|
+
|
|
49
|
+
// Return callback for removing the item from the queue
|
|
50
|
+
return () => {
|
|
51
|
+
// The processing has started and this queue has been passed already
|
|
52
|
+
if (this._inProgress != null && this._currentIndex >= p) {
|
|
53
|
+
return false;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
// find and remove the item
|
|
57
|
+
const i = q.findIndex(qi => qi === cb);
|
|
58
|
+
if (i >= 0) {
|
|
59
|
+
q.splice(i, 1);
|
|
60
|
+
// return true if we're sure that the item hasn't been executed yet
|
|
61
|
+
return true;
|
|
62
|
+
}
|
|
63
|
+
return false;
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
public async start() {
|
|
68
|
+
if (this._inProgress) {
|
|
69
|
+
return undefined;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
this._inProgress = true;
|
|
73
|
+
try {
|
|
74
|
+
await this.tryStartQueue();
|
|
75
|
+
} catch (err) {
|
|
76
|
+
this._logger?.warn('Failed to process queue:', err);
|
|
77
|
+
return false;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
return true;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
private getQueue(priority: number = 0) {
|
|
84
|
+
let q = this._queues[priority];
|
|
85
|
+
if (!q) {
|
|
86
|
+
q = [];
|
|
87
|
+
this._queues[priority] = q;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
return q;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
private async tryStartQueue() {
|
|
94
|
+
let current: QueueItem[] = null;
|
|
95
|
+
let iterations = 0;
|
|
96
|
+
|
|
97
|
+
await this._beforePriorityRun.triggerAsync(this._currentIndex);
|
|
98
|
+
|
|
99
|
+
while ((current = this._queues[this._currentIndex])?.length) {
|
|
100
|
+
if (iterations++ > 5) {
|
|
101
|
+
break;
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
this._logger?.log('Processing priority =', this._currentIndex, '; count =', current.length);
|
|
105
|
+
|
|
106
|
+
const items = current.slice();
|
|
107
|
+
current.length = 0;
|
|
108
|
+
|
|
109
|
+
await Promise.all(items.map((loader, index) => this._executeLoader(loader, this._currentIndex, index)));
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
if (!current?.length && iterations === 0) {
|
|
113
|
+
this._logger?.log('Skipping priority =', this._currentIndex, '; no items');
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
await this._afterPriorityRun.triggerAsync(this._currentIndex);
|
|
117
|
+
|
|
118
|
+
const next = this._currentIndex + 1;
|
|
119
|
+
if (next > this._maxIndex) {
|
|
120
|
+
// looks like we've finished!
|
|
121
|
+
this._inProgress = false;
|
|
122
|
+
this._logger?.log('Finished processing at index =', this._currentIndex);
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
++this._currentIndex;
|
|
127
|
+
await this.tryStartQueue();
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
private _executeLoader = async (l: QueueItem, priority: number, index?: number) => {
|
|
131
|
+
try {
|
|
132
|
+
await l();
|
|
133
|
+
} catch (err) {
|
|
134
|
+
this._logger?.warn('Failed to process queue item at priority =', priority, ' at index =', index || '?');
|
|
135
|
+
this._logger?.error(err);
|
|
136
|
+
}
|
|
137
|
+
};
|
|
138
|
+
}
|