@zajno/common 1.3.3 → 1.3.4

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.
Files changed (64) hide show
  1. package/coverage/clover.xml +41 -41
  2. package/coverage/coverage-final.json +39 -39
  3. package/coverage/lcov-report/NumberModel.ts.html +188 -0
  4. package/coverage/lcov-report/arrays.ts.html +602 -0
  5. package/coverage/lcov-report/calc.ts.html +278 -0
  6. package/coverage/lcov-report/enumHelper.ts.html +449 -0
  7. package/coverage/lcov-report/index.html +1 -1
  8. package/coverage/lcov-report/src/__tests__/helpers/index.html +1 -1
  9. package/coverage/lcov-report/src/__tests__/helpers/main.ts.html +1 -1
  10. package/coverage/lcov-report/src/async/arrays.ts.html +1 -1
  11. package/coverage/lcov-report/src/async/index.html +1 -1
  12. package/coverage/lcov-report/src/dates/calc.ts.html +1 -1
  13. package/coverage/lcov-report/src/dates/convert.ts.html +1 -1
  14. package/coverage/lcov-report/src/dates/datex.ts.html +1 -1
  15. package/coverage/lcov-report/src/dates/format.ts.html +1 -1
  16. package/coverage/lcov-report/src/dates/index.html +1 -1
  17. package/coverage/lcov-report/src/dates/index.ts.html +1 -1
  18. package/coverage/lcov-report/src/dates/parse.ts.html +1 -1
  19. package/coverage/lcov-report/src/dates/period.ts.html +1 -1
  20. package/coverage/lcov-report/src/dates/shift.ts.html +1 -1
  21. package/coverage/lcov-report/src/dates/types.ts.html +1 -1
  22. package/coverage/lcov-report/src/dates/yearDate.ts.html +1 -1
  23. package/coverage/lcov-report/src/enumHelper.ts.html +1 -1
  24. package/coverage/lcov-report/src/event.ts.html +1 -1
  25. package/coverage/lcov-report/src/index.html +1 -1
  26. package/coverage/lcov-report/src/lazy.light.ts.html +1 -1
  27. package/coverage/lcov-report/src/logger/batch.ts.html +1 -1
  28. package/coverage/lcov-report/src/logger/console.ts.html +1 -1
  29. package/coverage/lcov-report/src/logger/index.html +1 -1
  30. package/coverage/lcov-report/src/logger/index.ts.html +1 -1
  31. package/coverage/lcov-report/src/logger/named.ts.html +1 -1
  32. package/coverage/lcov-report/src/logger/proxy.ts.html +1 -1
  33. package/coverage/lcov-report/src/math/arrays.ts.html +1 -1
  34. package/coverage/lcov-report/src/math/calc.ts.html +1 -1
  35. package/coverage/lcov-report/src/math/distribution.ts.html +1 -1
  36. package/coverage/lcov-report/src/math/index.html +1 -1
  37. package/coverage/lcov-report/src/math/index.ts.html +1 -1
  38. package/coverage/lcov-report/src/transitionObserver.ts.html +1 -1
  39. package/coverage/lcov-report/src/types.ts.html +1 -1
  40. package/coverage/lcov-report/src/validation/ValidationErrors.ts.html +1 -1
  41. package/coverage/lcov-report/src/validation/creditCard.ts.html +1 -1
  42. package/coverage/lcov-report/src/validation/helpers.ts.html +1 -1
  43. package/coverage/lcov-report/src/validation/index.html +1 -1
  44. package/coverage/lcov-report/src/validation/index.ts.html +1 -1
  45. package/coverage/lcov-report/src/validation/types.ts.html +1 -1
  46. package/coverage/lcov-report/src/validation/validators.ts.html +1 -1
  47. package/coverage/lcov-report/src/validation/wrappers.ts.html +1 -1
  48. package/coverage/lcov-report/src/viewModels/FlagModel.ts.html +1 -1
  49. package/coverage/lcov-report/src/viewModels/LabeledFlagModel.ts.html +17 -26
  50. package/coverage/lcov-report/src/viewModels/MultiSelectModel.ts.html +1 -1
  51. package/coverage/lcov-report/src/viewModels/NumberModel.ts.html +1 -1
  52. package/coverage/lcov-report/src/viewModels/SelectModel.ts.html +1 -1
  53. package/coverage/lcov-report/src/viewModels/SelectViewModel.ts.html +17 -14
  54. package/coverage/lcov-report/src/viewModels/Validatable.ts.html +1 -1
  55. package/coverage/lcov-report/src/viewModels/index.html +1 -1
  56. package/coverage/lcov-report/src/viewModels/labeled.ts.html +128 -0
  57. package/coverage/lcov-report/src/viewModels/wrappers.ts.html +1 -1
  58. package/coverage/lcov-report/transitionObserver.ts.html +41 -77
  59. package/lib/viewModels/PromptModal.d.ts.map +1 -1
  60. package/lib/viewModels/PromptModal.js +1 -1
  61. package/lib/viewModels/PromptModal.js.map +1 -1
  62. package/package.json +1 -1
  63. package/src/viewModels/PromptModal.ts +1 -1
  64. package/yarn-error.log +0 -3709
package/coverage/lcov-report/src/viewModels/labeled.ts.html ADDED
@@ -0,0 +1,128 @@
1
+
2
+ <!doctype html>
3
+ <html lang="en">
4
+
5
+ <head>
6
+ <title>Code coverage report for src/viewModels/labeled.ts</title>
7
+ <meta charset="utf-8" />
8
+ <link rel="stylesheet" href="../../prettify.css" />
9
+ <link rel="stylesheet" href="../../base.css" />
10
+ <link rel="shortcut icon" type="image/x-icon" href="../../favicon.png" />
11
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
12
+ <style type='text/css'>
13
+ .coverage-summary .sorter {
14
+ background-image: url(../../sort-arrow-sprite.png);
15
+ }
16
+ </style>
17
+ </head>
18
+
19
+ <body>
20
+ <div class='wrapper'>
21
+ <div class='pad1'>
22
+ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/viewModels</a> labeled.ts</h1>
23
+ <div class='clearfix'>
24
+
25
+ <div class='fl pad1y space-right2'>
26
+ <span class="strong">100% </span>
27
+ <span class="quiet">Statements</span>
28
+ <span class='fraction'>6/6</span>
29
+ </div>
30
+
31
+
32
+ <div class='fl pad1y space-right2'>
33
+ <span class="strong">100% </span>
34
+ <span class="quiet">Branches</span>
35
+ <span class='fraction'>0/0</span>
36
+ </div>
37
+
38
+
39
+ <div class='fl pad1y space-right2'>
40
+ <span class="strong">100% </span>
41
+ <span class="quiet">Functions</span>
42
+ <span class='fraction'>2/2</span>
43
+ </div>
44
+
45
+
46
+ <div class='fl pad1y space-right2'>
47
+ <span class="strong">100% </span>
48
+ <span class="quiet">Lines</span>
49
+ <span class='fraction'>6/6</span>
50
+ </div>
51
+
52
+
53
+ </div>
54
+ <p class="quiet">
55
+ Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
56
+ </p>
57
+ </div>
58
+ <div class='status-line high'></div>
59
+ <pre><table class="coverage">
60
+ <tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
61
+ <a name='L2'></a><a href='#L2'>2</a>
62
+ <a name='L3'></a><a href='#L3'>3</a>
63
+ <a name='L4'></a><a href='#L4'>4</a>
64
+ <a name='L5'></a><a href='#L5'>5</a>
65
+ <a name='L6'></a><a href='#L6'>6</a>
66
+ <a name='L7'></a><a href='#L7'>7</a>
67
+ <a name='L8'></a><a href='#L8'>8</a>
68
+ <a name='L9'></a><a href='#L9'>9</a>
69
+ <a name='L10'></a><a href='#L10'>10</a>
70
+ <a name='L11'></a><a href='#L11'>11</a>
71
+ <a name='L12'></a><a href='#L12'>12</a>
72
+ <a name='L13'></a><a href='#L13'>13</a>
73
+ <a name='L14'></a><a href='#L14'>14</a>
74
+ <a name='L15'></a><a href='#L15'>15</a>
75
+ <a name='L16'></a><a href='#L16'>16</a>
76
+ <a name='L17'></a><a href='#L17'>17</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">2x</span>
77
+ <span class="cline-any cline-neutral">&nbsp;</span>
78
+ <span class="cline-any cline-neutral">&nbsp;</span>
79
+ <span class="cline-any cline-neutral">&nbsp;</span>
80
+ <span class="cline-any cline-neutral">&nbsp;</span>
81
+ <span class="cline-any cline-neutral">&nbsp;</span>
82
+ <span class="cline-any cline-neutral">&nbsp;</span>
83
+ <span class="cline-any cline-yes">2x</span>
84
+ <span class="cline-any cline-yes">1x</span>
85
+ <span class="cline-any cline-yes">1x</span>
86
+ <span class="cline-any cline-neutral">&nbsp;</span>
87
+ <span class="cline-any cline-yes">2x</span>
88
+ <span class="cline-any cline-neutral">&nbsp;</span>
89
+ <span class="cline-any cline-neutral">&nbsp;</span>
90
+ <span class="cline-any cline-yes">1x</span>
91
+ <span class="cline-any cline-neutral">&nbsp;</span>
92
+ <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { Getter } from '../types';
93
+ import { IValueModel } from './ValuesCollector';
94
+ &nbsp;
95
+ export interface ILabel&lt;T&gt; {
96
+ readonly label: T;
97
+ }
98
+ &nbsp;
99
+ export function withLabel&lt;T, TModel extends IValueModel&lt;T&gt;, TLabel = string&gt;(model: TModel, label: Getter&lt;TLabel&gt;) {
100
+ const _label = label;
101
+ Object.defineProperty(model, 'label', {
102
+ enumerable: false,
103
+ get() { return Getter.getValue(_label); },
104
+ });
105
+ &nbsp;
106
+ return model as TModel &amp; ILabel&lt;TLabel&gt;;
107
+ }
108
+ &nbsp;</pre></td></tr></table></pre>
109
+
110
+ <div class='push'></div><!-- for sticky footer -->
111
+ </div><!-- /wrapper -->
112
+ <div class='footer quiet pad2 space-top1 center small'>
113
+ Code coverage generated by
114
+ <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
115
+ at Sun Nov 21 2021 11:08:24 GMT+0000 (Coordinated Universal Time)
116
+ </div>
117
+ </div>
118
+ <script src="../../prettify.js"></script>
119
+ <script>
120
+ window.onload = function () {
121
+ prettyPrint();
122
+ };
123
+ </script>
124
+ <script src="../../sorter.js"></script>
125
+ <script src="../../block-navigation.js"></script>
126
+ </body>
127
+ </html>
128
+
package/coverage/lcov-report/src/viewModels/wrappers.ts.html CHANGED
@@ -211,7 +211,7 @@ export function mixinLabel&lt;T, TModel extends IValueModel&lt;T&gt;, TLabel = s
211
211
  <div class='footer quiet pad2 space-top1 center small'>
212
212
  Code coverage generated by
213
213
  <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
214
- at Mon Nov 29 2021 14:39:58 GMT+0000 (Coordinated Universal Time)
214
+ at Tue Nov 30 2021 14:08:10 GMT+0000 (Coordinated Universal Time)
215
215
  </div>
216
216
  </div>
217
217
  <script src="../../prettify.js"></script>
package/coverage/lcov-report/transitionObserver.ts.html CHANGED
@@ -23,30 +23,30 @@
23
23
  <div class='clearfix'>
24
24
 
25
25
  <div class='fl pad1y space-right2'>
26
- <span class="strong">91.25% </span>
26
+ <span class="strong">93.06% </span>
27
27
  <span class="quiet">Statements</span>
28
- <span class='fraction'>73/80</span>
28
+ <span class='fraction'>67/72</span>
29
29
  </div>
30
30
 
31
31
 
32
32
  <div class='fl pad1y space-right2'>
33
- <span class="strong">83.78% </span>
33
+ <span class="strong">87.88% </span>
34
34
  <span class="quiet">Branches</span>
35
- <span class='fraction'>31/37</span>
35
+ <span class='fraction'>29/33</span>
36
36
  </div>
37
37
 
38
38
 
39
39
  <div class='fl pad1y space-right2'>
40
- <span class="strong">85.71% </span>
40
+ <span class="strong">84.21% </span>
41
41
  <span class="quiet">Functions</span>
42
- <span class='fraction'>18/21</span>
42
+ <span class='fraction'>16/19</span>
43
43
  </div>
44
44
 
45
45
 
46
46
  <div class='fl pad1y space-right2'>
47
- <span class="strong">91.14% </span>
47
+ <span class="strong">92.96% </span>
48
48
  <span class="quiet">Lines</span>
49
- <span class='fraction'>72/79</span>
49
+ <span class='fraction'>66/71</span>
50
50
  </div>
51
51
 
52
52
 
@@ -209,19 +209,7 @@
209
209
  <a name='L150'></a><a href='#L150'>150</a>
210
210
  <a name='L151'></a><a href='#L151'>151</a>
211
211
  <a name='L152'></a><a href='#L152'>152</a>
212
- <a name='L153'></a><a href='#L153'>153</a>
213
- <a name='L154'></a><a href='#L154'>154</a>
214
- <a name='L155'></a><a href='#L155'>155</a>
215
- <a name='L156'></a><a href='#L156'>156</a>
216
- <a name='L157'></a><a href='#L157'>157</a>
217
- <a name='L158'></a><a href='#L158'>158</a>
218
- <a name='L159'></a><a href='#L159'>159</a>
219
- <a name='L160'></a><a href='#L160'>160</a>
220
- <a name='L161'></a><a href='#L161'>161</a>
221
- <a name='L162'></a><a href='#L162'>162</a>
222
- <a name='L163'></a><a href='#L163'>163</a>
223
- <a name='L164'></a><a href='#L164'>164</a>
224
- <a name='L165'></a><a href='#L165'>165</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
212
+ <a name='L153'></a><a href='#L153'>153</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
225
213
  <span class="cline-any cline-yes">1x</span>
226
214
  <span class="cline-any cline-yes">1x</span>
227
215
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -254,9 +242,6 @@
254
242
  <span class="cline-any cline-yes">1x</span>
255
243
  <span class="cline-any cline-yes">3x</span>
256
244
  <span class="cline-any cline-neutral">&nbsp;</span>
257
- <span class="cline-any cline-yes">3x</span>
258
- <span class="cline-any cline-yes">19x</span>
259
- <span class="cline-any cline-neutral">&nbsp;</span>
260
245
  <span class="cline-any cline-neutral">&nbsp;</span>
261
246
  <span class="cline-any cline-yes">7x</span>
262
247
  <span class="cline-any cline-yes">7x</span>
@@ -276,11 +261,8 @@
276
261
  <span class="cline-any cline-neutral">&nbsp;</span>
277
262
  <span class="cline-any cline-neutral">&nbsp;</span>
278
263
  <span class="cline-any cline-neutral">&nbsp;</span>
279
- <span class="cline-any cline-yes">7x</span>
280
- <span class="cline-any cline-no">&nbsp;</span>
281
- <span class="cline-any cline-neutral">&nbsp;</span>
282
- <span class="cline-any cline-yes">7x</span>
283
- <span class="cline-any cline-yes">7x</span>
264
+ <span class="cline-any cline-yes">9x</span>
265
+ <span class="cline-any cline-yes">9x</span>
284
266
  <span class="cline-any cline-neutral">&nbsp;</span>
285
267
  <span class="cline-any cline-neutral">&nbsp;</span>
286
268
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -305,18 +287,13 @@
305
287
  <span class="cline-any cline-neutral">&nbsp;</span>
306
288
  <span class="cline-any cline-neutral">&nbsp;</span>
307
289
  <span class="cline-any cline-neutral">&nbsp;</span>
308
- <span class="cline-any cline-yes">3x</span>
309
- <span class="cline-any cline-yes">3x</span>
310
- <span class="cline-any cline-no">&nbsp;</span>
290
+ <span class="cline-any cline-yes">2x</span>
291
+ <span class="cline-any cline-yes">2x</span>
292
+ <span class="cline-any cline-yes">2x</span>
293
+ <span class="cline-any cline-yes">2x</span>
311
294
  <span class="cline-any cline-neutral">&nbsp;</span>
312
295
  <span class="cline-any cline-neutral">&nbsp;</span>
313
- <span class="cline-any cline-yes">3x</span>
314
- <span class="cline-any cline-yes">3x</span>
315
- <span class="cline-any cline-yes">3x</span>
316
- <span class="cline-any cline-neutral">&nbsp;</span>
317
- <span class="cline-any cline-yes">3x</span>
318
- <span class="cline-any cline-neutral">&nbsp;</span>
319
- <span class="cline-any cline-yes">3x</span>
296
+ <span class="cline-any cline-yes">2x</span>
320
297
  <span class="cline-any cline-neutral">&nbsp;</span>
321
298
  <span class="cline-any cline-neutral">&nbsp;</span>
322
299
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -334,7 +311,6 @@
334
311
  <span class="cline-any cline-yes">12x</span>
335
312
  <span class="cline-any cline-yes">12x</span>
336
313
  <span class="cline-any cline-yes">5x</span>
337
- <span class="cline-any cline-yes">5x</span>
338
314
  <span class="cline-any cline-neutral">&nbsp;</span>
339
315
  <span class="cline-any cline-yes">12x</span>
340
316
  <span class="cline-any cline-yes">1x</span>
@@ -342,14 +318,14 @@
342
318
  <span class="cline-any cline-neutral">&nbsp;</span>
343
319
  <span class="cline-any cline-neutral">&nbsp;</span>
344
320
  <span class="cline-any cline-yes">7x</span>
345
- <span class="cline-any cline-yes">19x</span>
321
+ <span class="cline-any cline-yes">17x</span>
346
322
  <span class="cline-any cline-neutral">&nbsp;</span>
347
- <span class="cline-any cline-yes">19x</span>
323
+ <span class="cline-any cline-yes">17x</span>
348
324
  <span class="cline-any cline-neutral">&nbsp;</span>
349
325
  <span class="cline-any cline-yes">4x</span>
350
- <span class="cline-any cline-yes">15x</span>
326
+ <span class="cline-any cline-yes">13x</span>
351
327
  <span class="cline-any cline-neutral">&nbsp;</span>
352
- <span class="cline-any cline-yes">11x</span>
328
+ <span class="cline-any cline-yes">9x</span>
353
329
  <span class="cline-any cline-neutral">&nbsp;</span>
354
330
  <span class="cline-any cline-neutral">&nbsp;</span>
355
331
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -357,31 +333,31 @@
357
333
  <span class="cline-any cline-yes">4x</span>
358
334
  <span class="cline-any cline-neutral">&nbsp;</span>
359
335
  <span class="cline-any cline-neutral">&nbsp;</span>
360
- <span class="cline-any cline-yes">19x</span>
336
+ <span class="cline-any cline-yes">17x</span>
361
337
  <span class="cline-any cline-neutral">&nbsp;</span>
362
- <span class="cline-any cline-yes">19x</span>
338
+ <span class="cline-any cline-yes">17x</span>
363
339
  <span class="cline-any cline-neutral">&nbsp;</span>
364
- <span class="cline-any cline-yes">19x</span>
365
- <span class="cline-any cline-yes">11x</span>
340
+ <span class="cline-any cline-yes">17x</span>
341
+ <span class="cline-any cline-yes">10x</span>
366
342
  <span class="cline-any cline-neutral">&nbsp;</span>
367
- <span class="cline-any cline-yes">11x</span>
368
- <span class="cline-any cline-yes">11x</span>
343
+ <span class="cline-any cline-yes">10x</span>
344
+ <span class="cline-any cline-yes">10x</span>
369
345
  <span class="cline-any cline-neutral">&nbsp;</span>
370
346
  <span class="cline-any cline-neutral">&nbsp;</span>
371
- <span class="cline-any cline-yes">11x</span>
347
+ <span class="cline-any cline-yes">10x</span>
372
348
  <span class="cline-any cline-yes">1x</span>
373
349
  <span class="cline-any cline-neutral">&nbsp;</span>
374
350
  <span class="cline-any cline-neutral">&nbsp;</span>
375
351
  <span class="cline-any cline-neutral">&nbsp;</span>
376
- <span class="cline-any cline-yes">19x</span>
352
+ <span class="cline-any cline-yes">17x</span>
377
353
  <span class="cline-any cline-neutral">&nbsp;</span>
378
354
  <span class="cline-any cline-neutral">&nbsp;</span>
379
355
  <span class="cline-any cline-neutral">&nbsp;</span>
380
- <span class="cline-any cline-yes">3x</span>
381
- <span class="cline-any cline-yes">3x</span>
382
- <span class="cline-any cline-yes">3x</span>
383
- <span class="cline-any cline-yes">3x</span>
384
- <span class="cline-any cline-yes">3x</span>
356
+ <span class="cline-any cline-yes">2x</span>
357
+ <span class="cline-any cline-yes">2x</span>
358
+ <span class="cline-any cline-yes">2x</span>
359
+ <span class="cline-any cline-yes">2x</span>
360
+ <span class="cline-any cline-yes">2x</span>
385
361
  <span class="cline-any cline-neutral">&nbsp;</span>
386
362
  <span class="cline-any cline-neutral">&nbsp;</span>
387
363
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -404,8 +380,8 @@ export class TransitionObserver&lt;T&gt; implements IDisposable {
404
380
  private _cb: (v: T) =&gt; any;
405
381
  private _fireOnce = false;
406
382
  &nbsp;
407
- private _promise: Promise&lt;T&gt; = null;
408
- private _promiseReject: (err?: any) =&gt; any = null;
383
+ private _promise: Promise&lt;void&gt; = null;
384
+ private _promiseReject: (err: Error) =&gt; any = null;
409
385
  &nbsp;
410
386
  private logger: ILogger = createLogger('', true);
411
387
  &nbsp;
@@ -417,9 +393,6 @@ export class TransitionObserver&lt;T&gt; implements IDisposable {
417
393
  &nbsp;
418
394
  public get event(): IEvent&lt;T&gt; { return this._event; }
419
395
  public get currentValue() { return this._prev; }
420
- &nbsp;
421
- public get isObserving() { return this._disposer != null; }
422
- private get isPromising() { return this._promiseReject != null; }
423
396
  &nbsp;
424
397
  observe(getter: () =&gt; T) {
425
398
  this.dispose();
@@ -440,9 +413,6 @@ export class TransitionObserver&lt;T&gt; implements IDisposable {
440
413
  }
441
414
  &nbsp;
442
415
  cb(cb: (v: T) =&gt; any) {
443
- <span class="missing-if-branch" title="if path not taken" >I</span>if (this.isPromising) {
444
- <span class="cstat-no" title="statement not covered" > throw new Error('Cannot set callback when promise is running');</span>
445
- }
446
416
  this._cb = cb;
447
417
  return this;
448
418
  }
@@ -470,15 +440,10 @@ export class TransitionObserver&lt;T&gt; implements IDisposable {
470
440
  &nbsp;
471
441
  getPromise() {
472
442
  <span class="missing-if-branch" title="else path not taken" >E</span>if (!this._promise) {
473
- <span class="missing-if-branch" title="if path not taken" >I</span>if (!this.isObserving) {
474
- <span class="cstat-no" title="statement not covered" > return Promise.reject(new Error('Cannot get promise for disposed TransitionObserver'));</span>
475
- }
476
- &nbsp;
477
- this._promise = new Promise&lt;T&gt;((resolve, reject) =&gt; {
443
+ this._promise = new Promise&lt;void&gt;((resolve, reject) =&gt; {
478
444
  this._promiseReject = reject;
479
- this._cb = (v =&gt; this._finishPromise(resolve, v));
445
+ this.cb(() =&gt; this._finishPromise(resolve));
480
446
  });
481
- this.logger.log('started a new promise...');
482
447
  }
483
448
  return this._promise;
484
449
  }
@@ -498,9 +463,8 @@ export class TransitionObserver&lt;T&gt; implements IDisposable {
498
463
  this.logger.log(' disposing... ');
499
464
  if (this._disposer) {
500
465
  this._disposer();
501
- this._disposer = null;
502
466
  }
503
- if (this.isPromising) {
467
+ if (this._promiseReject) {
504
468
  this._finishPromise(this._promiseReject, new Error('TransitionObserver Aborted'));
505
469
  }
506
470
  };
@@ -540,12 +504,12 @@ export class TransitionObserver&lt;T&gt; implements IDisposable {
540
504
  return trigger;
541
505
  };
542
506
  &nbsp;
543
- private _finishPromise&lt;T&gt;(cb: (a?: T) =&gt; any, arg?: T) {
507
+ private _finishPromise(cb: (e?: any) =&gt; any, err?: Error) {
544
508
  this._promise = null;
545
509
  this._promiseReject = null;
546
510
  this._cb = null;
547
511
  <span class="missing-if-branch" title="else path not taken" >E</span>if (cb) {
548
- cb(arg);
512
+ cb(err);
549
513
  }
550
514
  }
551
515
  }
@@ -556,7 +520,7 @@ export class TransitionObserver&lt;T&gt; implements IDisposable {
556
520
  <div class='footer quiet pad2 space-top1 center small'>
557
521
  Code coverage generated by
558
522
  <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
559
- at Tue Nov 02 2021 16:09:11 GMT+0000 (Coordinated Universal Time)
523
+ at Mon Nov 01 2021 21:48:46 GMT+0000 (Coordinated Universal Time)
560
524
  </div>
561
525
  </div>
562
526
  <script src="prettify.js"></script>
package/lib/viewModels/PromptModal.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PromptModal.d.ts","sourceRoot":"","sources":["../../src/viewModels/PromptModal.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,oBAAY,eAAe,GAAG;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,qBAAa,gBAAgB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IACrE,SAAgB,QAAQ,YAAmB;IAG3C,OAAO,CAAC,cAAc,CAAW;;IAMjC,IAAI,aAAa,MAAkC;IAG5C,SAAS,WAAY,CAAC,UAG3B;IAGK,UAAU,aAGf;IAEF,SAAS,CAAC,SAAS,OAAc,MAAM,QAAQ,IAAI,CAAC,GAAG,IAAI,2DAWzD;CACL;AAED,oBAAY,iBAAiB,GAAG,eAAe,GAAG;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACvC,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,qBAAa,oBAAqB,SAAQ,gBAAgB,CAAC,iBAAiB,CAAC;IACzE,IAAI,YAAY,WAA8C;IAE9D,IAAI,WAAW,WAA6C;IAE5D,SAAS,sBAA6F;IACtG,QAAQ,sBAA6F;CACxG"}
1
+ {"version":3,"file":"PromptModal.d.ts","sourceRoot":"","sources":["../../src/viewModels/PromptModal.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,oBAAY,eAAe,GAAG;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,qBAAa,gBAAgB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IACrE,SAAgB,QAAQ,YAAmB;IAG3C,OAAO,CAAC,cAAc,CAAW;;IAMjC,IAAI,aAAa,MAAkC;IAG5C,SAAS,WAAY,CAAC,UAG3B;IAGK,UAAU,aAGf;IAEF,SAAS,CAAC,SAAS,OAAc,MAAM,QAAQ,IAAI,CAAC,GAAG,IAAI,2DAWzD;CACL;AAED,oBAAY,iBAAiB,GAAG,eAAe,GAAG;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACvC,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,qBAAa,oBAAqB,SAAQ,gBAAgB,CAAC,iBAAiB,CAAC;IACzE,IAAI,YAAY,WAA8C;IAE9D,IAAI,WAAW,WAA6C;IAE5D,SAAS,sBAA6F;IACtG,QAAQ,sBAA4F;CACvG"}
package/lib/viewModels/PromptModal.js CHANGED
@@ -48,7 +48,7 @@ class PromptModalViewModel extends ModalActionModel {
48
48
  constructor() {
49
49
  super(...arguments);
50
50
  this.onConfirm = () => this.runAction(this.currentAction.onConfirm, true, this.currentAction.awaitActions);
51
- this.onReject = () => this.runAction(this.currentAction.onConfirm, true, this.currentAction.awaitActions);
51
+ this.onReject = () => this.runAction(this.currentAction.onReject, true, this.currentAction.awaitActions);
52
52
  }
53
53
  get confirmColor() { return this.currentAction.confirmColor; }
54
54
  get rejectColor() { return this.currentAction.rejectColor; }
package/lib/viewModels/PromptModal.js.map CHANGED
@@ -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,CAAC,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,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IACzG,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"}
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,CAAC,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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zajno/common",
3
- "version": "1.3.3",
3
+ "version": "1.3.4",
4
4
  "description": "Zajno's re-usable utilities for JS/TS projects",
5
5
  "repository": {
6
6
  "type": "git",
package/src/viewModels/PromptModal.ts CHANGED
@@ -61,5 +61,5 @@ export class PromptModalViewModel extends ModalActionModel<PromptModalAction> {
61
61
  get rejectColor() { return this.currentAction.rejectColor; }
62
62
 
63
63
  onConfirm = () => this.runAction(this.currentAction.onConfirm, true, this.currentAction.awaitActions);
64
- onReject = () => this.runAction(this.currentAction.onConfirm, true, this.currentAction.awaitActions);
64
+ onReject = () => this.runAction(this.currentAction.onReject, true, this.currentAction.awaitActions);
65
65
  }