@zajno/common 1.4.19 → 1.5.0

package/coverage/lcov.info

@@ -1028,30 +1028,30 @@ FN:25,(anonymous_3)
 FNF:4
 FNH:4
 FNDA:10,(anonymous_0)
-FNDA:86,getValue
+FNDA:111,getValue
 FNDA:10,(anonymous_2)
 FNDA:7,(anonymous_3)
 DA:9,10
 DA:10,10
-DA:11,86
-DA:12,9
-DA:14,77
+DA:11,111
+DA:12,10
+DA:14,101
 DA:15,77
-DA:17,0
+DA:17,24
 DA:24,10
 DA:25,10
 LF:9
-LH:8
-BRDA:11,0,0,9
-BRDA:11,0,1,77
+LH:9
+BRDA:11,0,0,10
+BRDA:11,0,1,101
 BRDA:14,1,0,77
-BRDA:14,1,1,0
+BRDA:14,1,1,24
 BRDA:9,2,0,10
 BRDA:9,2,1,10
 BRDA:24,3,0,10
 BRDA:24,3,1,10
 BRF:8
-BRH:7
+BRH:8
 end_of_record
 TN:
 SF:src/__tests__/helpers/main.ts
@@ -3516,32 +3516,32 @@ BRH:3
 end_of_record
 TN:
 SF:src/viewModels/SelectModel.ts
-FN:19,(anonymous_0)
-FN:17,(anonymous_1)
-FN:86,(anonymous_2)
-FN:102,(anonymous_3)
-FN:109,(anonymous_4)
-FN:35,(anonymous_5)
-FN:38,(anonymous_6)
-FN:39,(anonymous_7)
-FN:42,(anonymous_8)
-FN:46,(anonymous_9)
-FN:50,(anonymous_10)
-FN:51,(anonymous_11)
-FN:56,(anonymous_12)
-FN:57,(anonymous_13)
-FN:64,(anonymous_14)
-FN:68,(anonymous_15)
-FN:75,(anonymous_16)
-FN:77,(anonymous_17)
-FN:81,(anonymous_18)
-FN:114,(anonymous_19)
-FN:116,(anonymous_20)
-FN:119,(anonymous_21)
-FN:123,(anonymous_22)
-FN:123,(anonymous_23)
-FN:138,(anonymous_24)
-FN:139,(anonymous_25)
+FN:23,(anonymous_0)
+FN:19,(anonymous_1)
+FN:97,(anonymous_2)
+FN:113,(anonymous_3)
+FN:120,(anonymous_4)
+FN:44,(anonymous_5)
+FN:47,(anonymous_6)
+FN:48,(anonymous_7)
+FN:51,(anonymous_8)
+FN:56,(anonymous_9)
+FN:60,(anonymous_10)
+FN:61,(anonymous_11)
+FN:66,(anonymous_12)
+FN:67,(anonymous_13)
+FN:74,(anonymous_14)
+FN:79,(anonymous_15)
+FN:86,(anonymous_16)
+FN:88,(anonymous_17)
+FN:92,(anonymous_18)
+FN:125,(anonymous_19)
+FN:127,(anonymous_20)
+FN:130,(anonymous_21)
+FN:134,(anonymous_22)
+FN:134,(anonymous_23)
+FN:149,(anonymous_24)
+FN:150,(anonymous_25)
 FNF:26
 FNH:22
 FNDA:6,(anonymous_0)
@@ -3553,7 +3553,7 @@ FNDA:0,(anonymous_5)
 FNDA:14,(anonymous_6)
 FNDA:34,(anonymous_7)
 FNDA:8,(anonymous_8)
-FNDA:1,(anonymous_9)
+FNDA:25,(anonymous_9)
 FNDA:0,(anonymous_10)
 FNDA:6,(anonymous_11)
 FNDA:0,(anonymous_12)
@@ -3575,80 +3575,82 @@ DA:2,2
 DA:3,2
 DA:4,2
 DA:6,2
-DA:9,2
-DA:11,6
-DA:13,6
-DA:14,6
-DA:15,6
+DA:8,2
+DA:10,2
+DA:12,6
+DA:16,6
 DA:17,6
-DA:20,6
+DA:19,6
 DA:21,6
-DA:24,6
 DA:25,6
-DA:31,6
+DA:28,6
+DA:30,6
 DA:32,6
-DA:35,0
-DA:39,34
-DA:43,8
-DA:47,1
-DA:50,0
-DA:52,6
-DA:53,6
-DA:56,0
-DA:58,4
-DA:59,4
-DA:60,3
-DA:65,4
-DA:69,5
-DA:70,5
-DA:71,4
-DA:75,0
-DA:78,11
-DA:82,16
-DA:86,6
-DA:87,16
-DA:88,0
-DA:91,16
+DA:40,6
+DA:41,6
+DA:44,0
+DA:48,34
+DA:52,8
+DA:57,25
+DA:60,0
+DA:62,6
+DA:63,6
+DA:66,0
+DA:68,4
+DA:69,4
+DA:70,3
+DA:75,4
+DA:76,4
+DA:80,5
+DA:81,5
+DA:82,4
+DA:86,0
+DA:89,11
 DA:93,16
-DA:94,0
+DA:97,6
 DA:98,16
-DA:99,16
-DA:101,16
-DA:102,45
-DA:105,16
-DA:109,6
-DA:110,1
-DA:111,1
-DA:115,1
-DA:117,3
-DA:119,9
-DA:123,18
-DA:124,15
-DA:125,7
-DA:129,3
-DA:132,1
-DA:137,2
-DA:139,3
-LF:59
-LH:53
-BRDA:22,0,0,3
-BRDA:87,1,0,0
-BRDA:87,1,1,16
-BRDA:93,2,0,0
-BRDA:93,2,1,16
-BRDA:101,3,0,15
-BRDA:101,3,1,1
-BRDA:53,4,0,5
-BRDA:53,4,1,1
-BRDA:59,5,0,3
-BRDA:59,5,1,1
-BRDA:65,6,0,4
-BRDA:65,6,1,0
-BRDA:70,7,0,4
-BRDA:70,7,1,1
-BRDA:124,8,0,7
-BRDA:124,8,1,8
-BRDA:138,9,0,2
+DA:99,0
+DA:102,16
+DA:104,16
+DA:105,0
+DA:109,16
+DA:110,16
+DA:112,16
+DA:113,45
+DA:116,16
+DA:120,6
+DA:121,1
+DA:122,1
+DA:126,1
+DA:128,3
+DA:130,9
+DA:134,18
+DA:135,15
+DA:136,7
+DA:140,3
+DA:143,1
+DA:148,2
+DA:150,3
+LF:61
+LH:55
+BRDA:26,0,0,3
+BRDA:98,1,0,0
+BRDA:98,1,1,16
+BRDA:104,2,0,0
+BRDA:104,2,1,16
+BRDA:112,3,0,15
+BRDA:112,3,1,1
+BRDA:63,4,0,5
+BRDA:63,4,1,1
+BRDA:69,5,0,3
+BRDA:69,5,1,1
+BRDA:76,6,0,4
+BRDA:76,6,1,0
+BRDA:81,7,0,4
+BRDA:81,7,1,1
+BRDA:135,8,0,7
+BRDA:135,8,1,8
+BRDA:149,9,0,2
 BRF:18
 BRH:15
 end_of_record

package/lib/viewModels/SelectModel.d.ts

@@ -1,16 +1,17 @@
 import { FlagModel, ILabeledFlagModel } from './FlagModel';
 import { ValidatableModel } from './Validatable';
 import { IValueModel } from './types';
-import { IResetableModel } from 'viewModels';
+import { IResetableModel } from './types';
+import { Getter } from '../types';
 export declare class Select<T = any> extends ValidatableModel<T> implements IValueModel<string>, IResetableModel {
-    private readonly _items;
     private readonly _accessor;
     private _index;
-    readonly opened: FlagModel;
+    private readonly _items;
     private _indexLocked;
     private _initialIndex;
     private readonly _flags;
-    constructor(_items: readonly T[], _accessor: (item: T) => string, initialIndex?: number);
+    readonly opened: FlagModel;
+    constructor(items: Getter<readonly T[]>, _accessor: (item: T) => string, initialIndex?: number);
     protected get valueToValidate(): T;
     get values(): readonly string[];
     get flags(): readonly ILabeledFlagModel[];

package/lib/viewModels/SelectModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SelectModel.d.ts","sourceRoot":"","sources":["../../src/viewModels/SelectModel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,qBAAa,MAAM,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAE,YAAW,WAAW,CAAC,MAAM,CAAC,EAAE,eAAe;IAWhG,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAV9B,OAAO,CAAC,MAAM,CAAqB;IAEnC,SAAgB,MAAM,YAAmB;IACzC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAgB;IAErC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAG1C,MAAM,EAAE,SAAS,CAAC,EAAE,EACpB,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,MAAM,EAC/C,YAAY,GAAE,MAAU;IAa5B,SAAS,KAAK,eAAe,MAAgC;IAG7D,IAAI,MAAM,IAAI,SAAS,MAAM,EAAE,CAE9B;IAED,IAAI,KAAK,iCAER;IAED,IAAI,KAAK,iBAER;IAED,IAAI,KAAK,IAMI,MAAM,CANuB;IAC1C,IAAI,aAAa,IAMQ,MAAM,CAH9B;IAED,IAAI,KAAK,CAAC,CAAC,EAAE,MAAM,EAA6B;IAChD,IAAI,aAAa,CAAC,KAAK,EAAE,MAAM,EAK9B;IAED,IAAI,YAAY,IAAI,CAAC,CAEpB;IAED,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,EAKvB;IAED,IAAI,SAAS,YAAiD;IAE9D,IAAI,KAAK,IAIM,MAAM,CAFpB;IAED,IAAI,KAAK,CAAC,GAAG,EAAE,MAAM,EAEpB;IAGM,QAAQ,QAAS,MAAM,UAqB5B;IAEF,KAAK,aAGH;IAEF,OAAO,CAAC,WAAW;CAoBtB;AAGD,qBAAa,YAAY,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;gBACtD,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE,YAAY,GAAE,MAAU;CAG5D"}
+{"version":3,"file":"SelectModel.d.ts","sourceRoot":"","sources":["../../src/viewModels/SelectModel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBAAa,MAAM,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAE,YAAW,WAAW,CAAC,MAAM,CAAC,EAAE,eAAe;IAehG,OAAO,CAAC,QAAQ,CAAC,SAAS;IAb9B,OAAO,CAAC,MAAM,CAAqB;IAEnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAE9C,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAgB;IAErC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAE/D,SAAgB,MAAM,YAAmB;gBAGrC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,EACV,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,MAAM,EAC/C,YAAY,GAAE,MAAU;IAkB5B,SAAS,KAAK,eAAe,MAAgC;IAG7D,IAAI,MAAM,IAAI,SAAS,MAAM,EAAE,CAE9B;IAED,IAAI,KAAK,iCAER;IAGD,IAAI,KAAK,IAAI,SAAS,CAAC,EAAE,CAExB;IAED,IAAI,KAAK,IAMI,MAAM,CANuB;IAC1C,IAAI,aAAa,IAMQ,MAAM,CAH9B;IAED,IAAI,KAAK,CAAC,CAAC,EAAE,MAAM,EAA6B;IAChD,IAAI,aAAa,CAAC,KAAK,EAAE,MAAM,EAK9B;IAED,IAAI,YAAY,IAAI,CAAC,CAGpB;IAED,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,EAKvB;IAED,IAAI,SAAS,YAAiD;IAE9D,IAAI,KAAK,IAIM,MAAM,CAFpB;IAED,IAAI,KAAK,CAAC,GAAG,EAAE,MAAM,EAEpB;IAGM,QAAQ,QAAS,MAAM,UAqB5B;IAEK,KAAK,aAGV;IAEF,OAAO,CAAC,WAAW;CAoBtB;AAGD,qBAAa,YAAY,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;gBACtD,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE,YAAY,GAAE,MAAU;CAG5D"}

package/lib/viewModels/SelectModel.js

@@ -1,22 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectString = exports.Select = void 0;
-const lazy_light_1 = require("../lazy.light");
 const mobx_1 = require("mobx");
+const lazy_light_1 = require("../lazy.light");
 const FlagModel_1 = require("./FlagModel");
 const Validatable_1 = require("./Validatable");
 const wrappers_1 = require("./wrappers");
+const types_1 = require("../types");
 class Select extends Validatable_1.ValidatableModel {
-    constructor(_items, _accessor, initialIndex = 0) {
+    constructor(items, _accessor, initialIndex = 0) {
         super();
-        this._items = _items;
         this._accessor = _accessor;
         // @observable
         this._index = undefined;
-        this.opened = new FlagModel_1.FlagModel();
         this._indexLocked = false;
         this._initialIndex = null;
         this._flags = lazy_light_1.createLazy(() => this.createFlags());
+        this.opened = new FlagModel_1.FlagModel();
         // @action
         this.setIndex = (val) => {
             if (this._indexLocked) {
@@ -41,9 +41,12 @@ class Select extends Validatable_1.ValidatableModel {
             super.reset();
             this.index = this._initialIndex;
         };
+        this._items = items;
         mobx_1.makeObservable(this, {
             '_index': mobx_1.observable,
+            '_items': mobx_1.observable.ref,
             values: mobx_1.computed,
+            items: mobx_1.computed,
             setIndex: mobx_1.action,
         });
         this._initialIndex = initialIndex;
@@ -52,13 +55,14 @@ class Select extends Validatable_1.ValidatableModel {
     get valueToValidate() { return this.selectedItem; }
     // @computed
     get values() {
-        return this._items.map(i => this._accessor(i));
+        return this.items.map(i => this._accessor(i));
     }
     get flags() {
         return this._flags.value;
     }
+    // @computed
     get items() {
-        return this._items;
+        return types_1.Getter.getValue(this._items);
     }
     get value() { return this.selectedValue; }
     get selectedValue() {
@@ -73,10 +77,11 @@ class Select extends Validatable_1.ValidatableModel {
         }
     }
     get selectedItem() {
-        return this._items.length ? this._items[this._index] : null;
+        const items = this.items;
+        return items.length ? items[this._index] : null;
     }
     set selectedItem(item) {
-        const index = this._items.indexOf(item);
+        const index = this.items.indexOf(item);
         if (index >= 0) {
             this.index = index;
         }
@@ -89,7 +94,7 @@ class Select extends Validatable_1.ValidatableModel {
         this.setIndex(val);
     }
     createFlags() {
-        const flags = this._items
+        const flags = this.items
             .map((item, index) => {
             const flag = wrappers_1.withLabel(new FlagModel_1.FlagModel(index === this.index), () => this._accessor(item));
             // react on every flag is changed directly

package/lib/viewModels/SelectModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"SelectModel.js","sourceRoot":"","sources":["../../src/viewModels/SelectModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SelectModel.js","sourceRoot":"","sources":["../../src/viewModels/SelectModel.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zajno/common",
-  "version": "1.4.19",
+  "version": "1.5.0",
   "description": "Zajno's re-usable utilities for JS/TS projects",
   "repository": {
     "type": "git",

package/src/viewModels/SelectModel.ts

@@ -1,30 +1,39 @@
-import { createLazy } from '../lazy.light';
 import { observable, computed, makeObservable, reaction, action } from 'mobx';
+import { createLazy } from '../lazy.light';
 import { FlagModel, ILabeledFlagModel } from './FlagModel';
 import { ValidatableModel } from './Validatable';
 import { IValueModel } from './types';
 import { withLabel } from './wrappers';
-import { IResetableModel } from 'viewModels';
+import { IResetableModel } from './types';
+import { Getter } from '../types';
 
 export class Select<T = any> extends ValidatableModel<T> implements IValueModel<string>, IResetableModel {
     // @observable
     private _index: number = undefined;
 
-    public readonly opened = new FlagModel();
+    private readonly _items: Getter<readonly T[]>;
+
     private _indexLocked = false;
     private _initialIndex: number = null;
 
     private readonly _flags = createLazy(() => this.createFlags());
 
+    public readonly opened = new FlagModel();
+
     constructor(
-        private readonly _items: readonly T[],
+        items: Getter<readonly T[]>,
         private readonly _accessor: (item: T) => string,
         initialIndex: number = 0,
     ) {
         super();
-        makeObservable<Select<T>, '_index'>(this, {
+
+        this._items = items;
+
+        makeObservable<Select<T>, '_index' | '_items'>(this, {
             '_index': observable,
+            '_items': observable.ref,
             values: computed,
+            items: computed,
             setIndex: action,
         });
 
@@ -36,15 +45,16 @@ export class Select<T = any> extends ValidatableModel<T> implements IValueModel<
 
     // @computed
     get values(): readonly string[] {
-        return this._items.map(i => this._accessor(i));
+        return this.items.map(i => this._accessor(i));
     }
 
     get flags() {
         return this._flags.value;
     }
 
-    get items() {
-        return this._items;
+    // @computed
+    get items(): readonly T[] {
+        return Getter.getValue(this._items);
     }
 
     get value() { return this.selectedValue; }
@@ -62,11 +72,12 @@ export class Select<T = any> extends ValidatableModel<T> implements IValueModel<
     }
 
     get selectedItem(): T {
-        return this._items.length ? this._items[this._index] : null;
+        const items = this.items;
+        return items.length ? items[this._index] : null;
     }
 
     set selectedItem(item: T) {
-        const index = this._items.indexOf(item);
+        const index = this.items.indexOf(item);
         if (index >= 0) {
             this.index = index;
         }
@@ -106,13 +117,13 @@ export class Select<T = any> extends ValidatableModel<T> implements IValueModel<
         }
     };
 
-    reset = () => {
+    public reset = () => {
         super.reset();
         this.index = this._initialIndex;
     };
 
     private createFlags() {
-        const flags: ReadonlyArray<ILabeledFlagModel> = this._items
+        const flags: ReadonlyArray<ILabeledFlagModel> = this.items
             .map((item, index) => {
                 const flag: ILabeledFlagModel = withLabel(
                     new FlagModel(index === this.index),