@zajno/common 1.3.2 → 1.3.6

package/src/viewModels/Validatable.ts

@@ -38,6 +38,14 @@ export abstract class ValidatableModel<T = string> {
         return this;
     }
 
+    public async testValidate(value: T) {
+        if (this._validator) {
+            const res = await this._validator(value);
+            return res;
+        }
+        return null;
+    }
+
     async validate() {
         if (!this._validator) {
             return true;

package/src/viewModels/__tests__/multiSelect.test.ts

@@ -1,23 +1,138 @@
-import { MultiSelect } from '../MultiSelectModel';
+import { reaction, toJS } from 'mobx';
+import { arrayRepeat } from '../../math';
+import { MultiSelect, MultiSelectString } from '../MultiSelectModel';
+
+type SetType<T> = { items: T[], selected: number[], accessor: (item: T) => string };
 
 describe('MultiSelectModel', () => {
-    it('consistent', () => {
+    it('creates', () => {
         expect(() => new MultiSelect(null, null).values).toThrow();
         expect(() => new MultiSelect([1], null).values).toThrow();
+    });
+
+    const sets: SetType<any>[] = [
+        { items: [1, 2, 3], selected: [1], accessor: i => `_${i}_` },
+        { items: [1, 2, 3], selected: [], accessor: i => `_${i}_` },
+        { items: ['a', 'b', 'c'], selected: [2], accessor: i => i },
+    ];
+
+    describe('consistent', () => {
+        sets.forEach((set, setIndex) => {
+            it(`variant ${setIndex + 1}`, () => {
+                const items = set.items; // [1, 2, 3];
+                const accessor = set.accessor; // (i: number) => `_${i}_`;
+                const initialSelected = set.selected; // [1];
+                const values = items.map(accessor);
+                const selectedValues = initialSelected.map(i => accessor(items[i]));
 
-        const items = [1, 2, 3];
-        const accessor = (i: number) => `_${i}_`;
-        const values = items.map(accessor);
-        const initialSelected = [1];
+                const vm = new MultiSelect(items, accessor, ...initialSelected);
 
-        const vm = new MultiSelect(items, accessor, ...initialSelected);
+                expect(vm.items).toStrictEqual(items);
+                expect(vm.values).toStrictEqual(values);
+                expect(vm.count).toBe(items.length);
+                expect(vm.selectedCount).toBe(initialSelected.length);
+                expect(vm.selectedIndexes).toStrictEqual(initialSelected);
+                expect(vm.selectedValues).toStrictEqual(selectedValues);
 
-        expect(vm.items).toStrictEqual(items);
-        expect(vm.values).toStrictEqual(values);
-        expect(vm.selectedIndexes).toStrictEqual(initialSelected);
+                initialSelected.forEach(index => {
+                    expect(vm.isIndexSelected(index)).toBe(initialSelected.includes(index));
+                });
 
-        initialSelected.forEach(index => {
-            expect(vm.isIndexSelected(index)).toBe(initialSelected.includes(index));
+                values.forEach((value) => {
+                    expect(vm.isValueSelected(value)).toBe(selectedValues.includes(value));
+                });
+            });
         });
+
+    });
+
+    it('reacts', () => {
+        const vm = new MultiSelectString(['a', 'b', 'c']);
+
+        expect(vm.count).toBe(3);
+        expect(vm.selectedCount).toBe(0);
+        expect(vm.selectedIndexes).toHaveLength(0);
+
+        const mocks = arrayRepeat(() => jest.fn().mockImplementation(null), 5);
+        const [
+            onSelectedIndexes,
+            onSelectedItems,
+            onSelectedValues,
+            onIsIndexSelected,
+            onIsValueSelected,
+        ] = mocks;
+
+        const wrapMock = mock => ((a: any) => mock(toJS(a)));
+
+        const expectEmptyCalls = () => {
+            expect(onSelectedIndexes).toHaveBeenCalledWith([]);
+            expect(onSelectedItems).toHaveBeenCalledWith([]);
+            expect(onSelectedValues).toHaveBeenCalledWith([]);
+            mocks.forEach(m => m.mockClear());
+        };
+
+        reaction(() => vm.selectedIndexes, wrapMock(onSelectedIndexes));
+        reaction(() => vm.selectedItems, wrapMock(onSelectedItems));
+        reaction(() => vm.selectedValues, wrapMock(onSelectedValues));
+
+        // initially – 'false', so expect only when 'true' should be passed
+        reaction(() => vm.isIndexSelected(0), wrapMock(onIsIndexSelected));
+        reaction(() => vm.isValueSelected('a'), wrapMock(onIsValueSelected));
+
+        vm.selectIndex(1);
+
+        expect(onSelectedIndexes).toHaveBeenCalledWith([1]);
+        expect(onSelectedItems).toHaveBeenCalledWith(['b']);
+        expect(onSelectedValues).toHaveBeenCalledWith(['b']);
+        expect(onIsIndexSelected).not.toHaveBeenCalled();
+        expect(onIsValueSelected).not.toHaveBeenCalled();
+        mocks.forEach(m => m.mockClear());
+
+        vm.deSelectIndex(1);
+        expect(onIsIndexSelected).not.toHaveBeenCalled();
+        expect(onIsValueSelected).not.toHaveBeenCalled();
+        expectEmptyCalls();
+
+        vm.selectItem('c');
+
+        expect(onSelectedIndexes).toHaveBeenCalledWith([2]);
+        expect(onSelectedItems).toHaveBeenCalledWith(['c']);
+        expect(onSelectedValues).toHaveBeenCalledWith(['c']);
+        expect(onIsIndexSelected).not.toHaveBeenCalled();
+        expect(onIsValueSelected).not.toHaveBeenCalled();
+        mocks.forEach(m => m.mockClear());
+
+        vm.deSelectItem('c');
+        expect(onIsIndexSelected).not.toHaveBeenCalled();
+        expect(onIsValueSelected).not.toHaveBeenCalled();
+        expectEmptyCalls();
+
+        vm.selectValue('a');
+
+        expect(onSelectedIndexes).toHaveBeenCalledWith([0]);
+        expect(onSelectedItems).toHaveBeenCalledWith(['a']);
+        expect(onSelectedValues).toHaveBeenCalledWith(['a']);
+        expect(onIsIndexSelected).toHaveBeenCalledWith(true);
+        expect(onIsValueSelected).toHaveBeenCalledWith(true);
+        mocks.forEach(m => m.mockClear());
+
+        vm.deSelectValue('a');
+        expect(onIsIndexSelected).toHaveBeenCalledWith(false);
+        expect(onIsValueSelected).toHaveBeenCalledWith(false);
+        expectEmptyCalls();
+
+        vm.selectItems(['a', 'b']);
+
+        expect(onSelectedIndexes).toHaveBeenCalledWith([0, 1]);
+        expect(onSelectedItems).toHaveBeenCalledWith(['a', 'b']);
+        expect(onSelectedValues).toHaveBeenCalledWith(['a', 'b']);
+        expect(onIsIndexSelected).toHaveBeenCalledWith(true);
+        expect(onIsValueSelected).toHaveBeenCalledWith(true);
+        mocks.forEach(m => m.mockClear());
+
+        vm.reset();
+        expect(onIsIndexSelected).toHaveBeenCalledWith(false);
+        expect(onIsValueSelected).toHaveBeenCalledWith(false);
+        expectEmptyCalls();
     });
 });

package/coverage/lcov-report/NumberModel.ts.html

@@ -1,188 +0,0 @@
-
-<!doctype html>
-<html lang="en">
-
-<head>
-    <title>Code coverage report for NumberModel.ts</title>
-    <meta charset="utf-8" />
-    <link rel="stylesheet" href="prettify.css" />
-    <link rel="stylesheet" href="base.css" />
-    <link rel="shortcut icon" type="image/x-icon" href="favicon.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <style type='text/css'>
-        .coverage-summary .sorter {
-            background-image: url(sort-arrow-sprite.png);
-        }
-    </style>
-</head>
-    
-<body>
-<div class='wrapper'>
-    <div class='pad1'>
-        <h1><a href="index.html">All files</a> NumberModel.ts</h1>
-        <div class='clearfix'>
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">80% </span>
-                <span class="quiet">Statements</span>
-                <span class='fraction'>16/20</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">0% </span>
-                <span class="quiet">Branches</span>
-                <span class='fraction'>0/3</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">33.33% </span>
-                <span class="quiet">Functions</span>
-                <span class='fraction'>2/6</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">85.71% </span>
-                <span class="quiet">Lines</span>
-                <span class='fraction'>12/14</span>
-            </div>
-        
-            
-        </div>
-        <p class="quiet">
-            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.
-        </p>
-    </div>
-    <div class='status-line high'></div>
-    <pre><table class="coverage">
-<tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
-<a name='L2'></a><a href='#L2'>2</a>
-<a name='L3'></a><a href='#L3'>3</a>
-<a name='L4'></a><a href='#L4'>4</a>
-<a name='L5'></a><a href='#L5'>5</a>
-<a name='L6'></a><a href='#L6'>6</a>
-<a name='L7'></a><a href='#L7'>7</a>
-<a name='L8'></a><a href='#L8'>8</a>
-<a name='L9'></a><a href='#L9'>9</a>
-<a name='L10'></a><a href='#L10'>10</a>
-<a name='L11'></a><a href='#L11'>11</a>
-<a name='L12'></a><a href='#L12'>12</a>
-<a name='L13'></a><a href='#L13'>13</a>
-<a name='L14'></a><a href='#L14'>14</a>
-<a name='L15'></a><a href='#L15'>15</a>
-<a name='L16'></a><a href='#L16'>16</a>
-<a name='L17'></a><a href='#L17'>17</a>
-<a name='L18'></a><a href='#L18'>18</a>
-<a name='L19'></a><a href='#L19'>19</a>
-<a name='L20'></a><a href='#L20'>20</a>
-<a name='L21'></a><a href='#L21'>21</a>
-<a name='L22'></a><a href='#L22'>22</a>
-<a name='L23'></a><a href='#L23'>23</a>
-<a name='L24'></a><a href='#L24'>24</a>
-<a name='L25'></a><a href='#L25'>25</a>
-<a name='L26'></a><a href='#L26'>26</a>
-<a name='L27'></a><a href='#L27'>27</a>
-<a name='L28'></a><a href='#L28'>28</a>
-<a name='L29'></a><a href='#L29'>29</a>
-<a name='L30'></a><a href='#L30'>30</a>
-<a name='L31'></a><a href='#L31'>31</a>
-<a name='L32'></a><a href='#L32'>32</a>
-<a name='L33'></a><a href='#L33'>33</a>
-<a name='L34'></a><a href='#L34'>34</a>
-<a name='L35'></a><a href='#L35'>35</a>
-<a name='L36'></a><a href='#L36'>36</a>
-<a name='L37'></a><a href='#L37'>37</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { action, makeObservable, observable } from 'mobx';
-import { IValueModel } from './ValuesCollector';
-&nbsp;
-export interface INumberModel {
-    value: number;
-}
-&nbsp;
-export class NumberModel implements INumberModel, IValueModel&lt;number&gt; {
-&nbsp;
-    @observable
-    private _value: number = 0;
-&nbsp;
-    private _initial: number = 0;
-&nbsp;
-    constructor(initial: number = <span class="branch-0 cbranch-no" title="branch not covered" >0)</span> {
-        makeObservable(this);
-        this._initial = initial;
-        this._value = this._initial;
-    }
-&nbsp;
-    get value() { return this._value; }
-<span class="fstat-no" title="function not covered" >    set v</span>alue(v: number) { <span class="cstat-no" title="statement not covered" >this._value = v; </span>}
-&nbsp;
-    @action
-    reset = <span class="fstat-no" title="function not covered" >() =</span>&gt; {
-<span class="cstat-no" title="statement not covered" >        this._value = this._initial;</span>
-    };
-&nbsp;
-    @action
-    increment = <span class="fstat-no" title="function not covered" >(d</span> = <span class="branch-0 cbranch-no" title="branch not covered" >1)</span> =&gt; <span class="cstat-no" title="statement not covered" >this.value += d;</span>
-&nbsp;
-    @action
-    decrement = <span class="fstat-no" title="function not covered" >(d</span> = <span class="branch-0 cbranch-no" title="branch not covered" >1)</span> =&gt; <span class="cstat-no" title="statement not covered" >this.value -= d;</span>
-}
-&nbsp;
-export default NumberModel;
-&nbsp;</pre></td></tr></table></pre>
-
-                <div class='push'></div><!-- for sticky footer -->
-            </div><!-- /wrapper -->
-            <div class='footer quiet pad2 space-top1 center small'>
-                Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Sun Nov 21 2021 10:42:03 GMT+0000 (Coordinated Universal Time)
-            </div>
-        </div>
-        <script src="prettify.js"></script>
-        <script>
-            window.onload = function () {
-                prettyPrint();
-            };
-        </script>
-        <script src="sorter.js"></script>
-        <script src="block-navigation.js"></script>
-    </body>
-</html>
-