@zajno/common 1.2.8 → 1.3.0-beta

package/lib/viewModels/SelectModel.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SelectString = exports.Select = void 0;
+const tslib_1 = require("tslib");
+const lazy_light_1 = require("../lazy.light");
+const mobx_1 = require("mobx");
+const FlagModel_1 = require("./FlagModel");
+const Validatable_1 = require("./Validatable");
+const wrappers_1 = require("./wrappers");
+class Select extends Validatable_1.ValidatableModel {
+    constructor(_items, _accessor, initialIndex = 0) {
+        super();
+        this._items = _items;
+        this._accessor = _accessor;
+        this._index = undefined;
+        this.opened = new FlagModel_1.FlagModel();
+        this._indexLocked = false;
+        this._initialIndex = null;
+        this._flags = lazy_light_1.createLazy(() => this.createFlags());
+        this.reset = () => {
+            super.reset();
+            this.index = this._initialIndex;
+        };
+        mobx_1.makeObservable(this);
+        this._initialIndex = initialIndex;
+        this._index = initialIndex;
+    }
+    get valueToValidate() { return this.selectedItem; }
+    get values() {
+        return this._items.map(i => this._accessor(i));
+    }
+    get flags() {
+        return this._flags.value;
+    }
+    get items() {
+        return this._items;
+    }
+    get value() { return this.selectedValue; }
+    get selectedValue() {
+        const vs = this.values;
+        return vs.length ? vs[this._index] : null;
+    }
+    set value(v) { this.selectedValue = v; }
+    set selectedValue(value) {
+        const index = this.values.indexOf(value);
+        if (index >= 0) {
+            this.index = index;
+        }
+    }
+    get selectedItem() {
+        return this._items.length ? this._items[this._index] : null;
+    }
+    set selectedItem(item) {
+        const index = this._items.indexOf(item);
+        if (index >= 0) {
+            this.index = index;
+        }
+    }
+    get index() {
+        return this._index;
+    }
+    set index(val) {
+        if (this._indexLocked) {
+            return;
+        }
+        this._index = val;
+        // update all flags to be properly selected
+        try {
+            this._indexLocked = true;
+            if (this._flags.hasValue) {
+                this._flags.value.forEach((f, i) => f.value = (i === this._index));
+            }
+        }
+        finally {
+            this._indexLocked = false;
+        }
+    }
+    createFlags() {
+        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
+            mobx_1.reaction(() => flag.value, isSelected => {
+                if (isSelected) {
+                    this.index = index;
+                }
+            });
+            return flag;
+        });
+        return flags;
+    }
+}
+tslib_1.__decorate([
+    mobx_1.observable,
+    tslib_1.__metadata("design:type", Number)
+], Select.prototype, "_index", void 0);
+tslib_1.__decorate([
+    mobx_1.computed,
+    tslib_1.__metadata("design:type", Array),
+    tslib_1.__metadata("design:paramtypes", [])
+], Select.prototype, "values", null);
+exports.Select = Select;
+class SelectString extends Select {
+    constructor(items, initialIndex = 0) {
+        super(items, v => v, initialIndex);
+    }
+}
+exports.SelectString = SelectString;
+//# sourceMappingURL=SelectModel.js.map

package/lib/viewModels/SelectModel.js.map

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

package/lib/viewModels/{TextInputViewModel.d.ts → TextModel.d.ts}

@@ -1,23 +1,24 @@
-import { ValidatableViewModel, ValidationConfig } from './Validatable';
-export declare type StringGetter = (() => string) | string;
+import { Getter } from '../types';
+import { ValidatableModel, ValidationConfig } from './Validatable';
+import { IValueModel } from './ValuesCollector';
 export declare type TextInputConfig = {
-    name?: StringGetter;
-    title?: StringGetter;
-    value?: StringGetter;
+    name?: Getter<string>;
+    title?: Getter<string>;
+    value?: Getter<string>;
     async?: boolean;
-    validation?: ValidationConfig;
+    validation?: ValidationConfig<string>;
     noSubscribe?: boolean;
 };
 export declare class Text {
     private _value;
     constructor(config: {
-        value: StringGetter;
+        value: Getter<string>;
         async?: boolean;
         noSubscribe?: boolean;
     });
     get value(): string;
 }
-export declare class TextInputVM extends ValidatableViewModel {
+export declare class TextInputVM extends ValidatableModel implements IValueModel<string> {
     private _value;
     private _focused;
     private _name;
@@ -35,4 +36,4 @@ export declare class TextInputVM extends ValidatableViewModel {
     private onBlur;
     reset(): void;
 }
-//# sourceMappingURL=TextInputViewModel.d.ts.map
+//# sourceMappingURL=TextModel.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"TextModel.d.ts","sourceRoot":"","sources":["../../src/viewModels/TextModel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,oBAAY,eAAe,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,UAAU,CAAC,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACtC,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAeF,qBAAa,IAAI;IAEb,OAAO,CAAC,MAAM,CAAgB;gBAElB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE;IAKrF,IAAI,KAAK,WAA0B;CACtC;AAED,qBAAa,WAAY,SAAQ,gBAAiB,YAAW,WAAW,CAAC,MAAM,CAAC;IAE5E,OAAO,CAAC,MAAM,CAAM;IAGpB,OAAO,CAAC,QAAQ,CAAS;IAGzB,OAAO,CAAC,KAAK,CAAgB;IAG7B,OAAO,CAAC,MAAM,CAAgB;IAE9B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAoB;gBAExC,MAAM,CAAC,EAAE,eAAe;IAYpC,IAAI,KAAK,WAA0B;IACnC,IAAI,IAAI,WAAyB;IACjC,IAAI,KAAK,WAA0B;IAEnC,IAAI,KAAK,CAAC,GAAG,QAAA,EAMZ;IAED,IACI,OAAO,YAEV;IAED,IAAI,OAAO,YAEV;IAED,IAAI,OAAO,CAAC,GAAG,SAAA,EAQd;IAED,SAAS,KAAK,eAAe,WAAwC;IAErE,OAAO,CAAC,MAAM;IAKd,KAAK;CAMR"}

package/lib/viewModels/{TextInputViewModel.js → TextModel.js}

@@ -3,24 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TextInputVM = exports.Text = void 0;
 const tslib_1 = require("tslib");
 const mobx_1 = require("mobx");
+const types_1 = require("../types");
 const logger_1 = tslib_1.__importDefault(require("../logger"));
 const Validatable_1 = require("./Validatable");
 function FromGetter(getter, setter, autorunDelay = null, noAutorun = null) {
-    if (typeof getter === 'function') {
-        if (noAutorun) {
-            setter(getter());
-        }
-        else {
-            mobx_1.autorun(() => {
-                setter(getter());
-            }, { delay: autorunDelay });
-            return true;
-        }
-    }
-    else if (typeof getter === 'string') {
-        setter(getter);
+    if (noAutorun || typeof getter !== 'function') {
+        setter(types_1.Getter.getValue(getter));
+        return null;
     }
-    return false;
+    return mobx_1.reaction(() => types_1.Getter.getValue(getter), setter, { delay: autorunDelay, fireImmediately: true });
 }
 class Text {
     constructor(config) {
@@ -35,7 +26,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", String)
 ], Text.prototype, "_value", void 0);
 exports.Text = Text;
-class TextInputVM extends Validatable_1.ValidatableViewModel {
+class TextInputVM extends Validatable_1.ValidatableModel {
     constructor(config) {
         super(config && config.validation);
         this._value = '';
@@ -75,7 +66,7 @@ class TextInputVM extends Validatable_1.ValidatableViewModel {
         }
         super.reset();
     }
-    get valueToValidate() { return this.value; }
+    get valueToValidate() { var _a; return ((_a = this.value) !== null && _a !== void 0 ? _a : '').trim(); }
     onBlur() {
         this.validate();
     }
@@ -113,4 +104,4 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", void 0)
 ], TextInputVM.prototype, "reset", null);
 exports.TextInputVM = TextInputVM;
-//# sourceMappingURL=TextInputViewModel.js.map
+//# sourceMappingURL=TextModel.js.map

package/lib/viewModels/TextModel.js.map

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

package/lib/viewModels/Validatable.d.ts

@@ -1,23 +1,25 @@
 import { ValidatorFunction, ValidatorFunctionAsync } from '../validation';
-export declare type ValueValidator = ValidatorFunction | ValidatorFunctionAsync;
+export declare type ValueValidator<T> = ValidatorFunction<T> | ValidatorFunctionAsync<T>;
 export declare type ValidationErrorsStrings = {
     [code: number]: string;
 };
-export declare type ValidationConfig = {
-    validator: ValueValidator;
+export declare type ValidationConfig<T> = {
+    validator: ValueValidator<Readonly<T>>;
     errors: ValidationErrorsStrings;
 };
-export declare abstract class ValidatableViewModel {
+export declare abstract class ValidatableModel<T = string> {
     private _validator;
     private _strings;
     private _error;
     private _validationError;
-    constructor(config?: ValidationConfig);
-    protected abstract get valueToValidate(): string;
+    constructor(config?: ValidationConfig<T>);
+    protected abstract get valueToValidate(): Readonly<T>;
     get isValid(): boolean;
     get error(): string;
+    setValidationConfig(config?: ValidationConfig<T>): this;
     validate(): Promise<boolean>;
+    getIsInvalid(): Promise<boolean>;
     reset(): void;
-    static IsSomeInvalid(validatables: ValidatableViewModel[], stopOnFail?: boolean): Promise<boolean>;
+    static IsSomeInvalid(validatables: ReadonlyArray<Readonly<ValidatableModel>>, stopOnFail?: boolean): Promise<boolean>;
 }
 //# sourceMappingURL=Validatable.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Validatable.d.ts","sourceRoot":"","sources":["../../src/viewModels/Validatable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAqC,MAAM,eAAe,CAAC;AAG7G,oBAAY,cAAc,GAAG,iBAAiB,GAAG,sBAAsB,CAAC;AACxE,oBAAY,uBAAuB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEjE,oBAAY,gBAAgB,GAAG;IAAE,SAAS,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE,uBAAuB,CAAA;CAAE,CAAC;AAE9F,8BAAsB,oBAAoB;IAEtC,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,QAAQ,CAAiC;IAGjD,OAAO,CAAC,MAAM,CAAgB;IAE9B,OAAO,CAAC,gBAAgB,CAAyB;gBAErC,MAAM,CAAC,EAAE,gBAAgB;IAMrC,SAAS,CAAC,QAAQ,KAAK,eAAe,IAAI,MAAM,CAAC;IAEjD,IAAI,OAAO,YAA2B;IAEtC,IAAI,KAAK,WAA0B;IAE7B,QAAQ;IAuBd,KAAK;WAKQ,aAAa,CAAC,YAAY,EAAE,oBAAoB,EAAE,EAAE,UAAU,UAAO;CAQrF"}
+{"version":3,"file":"Validatable.d.ts","sourceRoot":"","sources":["../../src/viewModels/Validatable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAqC,MAAM,eAAe,CAAC;AAG7G,oBAAY,cAAc,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;AACjF,oBAAY,uBAAuB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEjE,oBAAY,gBAAgB,CAAC,CAAC,IAAI;IAC9B,SAAS,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACvC,MAAM,EAAE,uBAAuB,CAAC;CACnC,CAAC;AAGF,8BAAsB,gBAAgB,CAAC,CAAC,GAAG,MAAM;IAE7C,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,QAAQ,CAAiC;IAGjD,OAAO,CAAC,MAAM,CAAgB;IAE9B,OAAO,CAAC,gBAAgB,CAAyB;gBAErC,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAKxC,SAAS,CAAC,QAAQ,KAAK,eAAe,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEtD,IAAI,OAAO,YAA2B;IAEtC,IAAI,KAAK,WAA0B;IAE5B,mBAAmB,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAMjD,QAAQ;IAuBR,YAAY;IAMlB,KAAK;WAKQ,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,EAAE,UAAU,UAAO;CAQxG"}

package/lib/viewModels/Validatable.js

@@ -1,29 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ValidatableViewModel = void 0;
+exports.ValidatableModel = void 0;
 const tslib_1 = require("tslib");
 const mobx_1 = require("mobx");
 const validation_1 = require("../validation");
 const arrays_1 = require("../async/arrays");
-class ValidatableViewModel {
+const EmptyValidator = () => validation_1.ValidationErrors.None;
+class ValidatableModel {
     constructor(config) {
         this._validator = null;
         this._strings = null;
         this._error = null;
         this._validationError = null;
         mobx_1.makeObservable(this);
-        this._validator = (config && config.validator) || (() => validation_1.ValidationErrors.None);
-        this._strings = config && config.errors;
+        this.setValidationConfig(config);
     }
     get isValid() { return !this._error; }
     get error() { return this._error; }
+    setValidationConfig(config) {
+        this._validator = (config === null || config === void 0 ? void 0 : config.validator) || EmptyValidator;
+        this._strings = config === null || config === void 0 ? void 0 : config.errors;
+        return this;
+    }
     async validate() {
-        var _a;
         if (!this._validator) {
             return true;
         }
         try {
-            const valid = await this._validator(((_a = this.valueToValidate) !== null && _a !== void 0 ? _a : '').trim());
+            const valid = await this._validator(this.valueToValidate);
             this._validationError = valid === validation_1.ValidationErrors.None
                 ? null
                 : new validation_1.ValidationError('Unknown error', valid);
@@ -40,6 +44,10 @@ class ValidatableViewModel {
         }
         return this._validationError == null;
     }
+    async getIsInvalid() {
+        const valid = await this.validate();
+        return !valid;
+    }
     reset() {
         this._validationError = null;
         this._error = null;
@@ -55,6 +63,12 @@ class ValidatableViewModel {
 tslib_1.__decorate([
     mobx_1.observable,
     tslib_1.__metadata("design:type", String)
-], ValidatableViewModel.prototype, "_error", void 0);
-exports.ValidatableViewModel = ValidatableViewModel;
+], ValidatableModel.prototype, "_error", void 0);
+tslib_1.__decorate([
+    mobx_1.action,
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", void 0)
+], ValidatableModel.prototype, "reset", null);
+exports.ValidatableModel = ValidatableModel;
 //# sourceMappingURL=Validatable.js.map

package/lib/viewModels/Validatable.js.map

@@ -1 +1 @@
-{"version":3,"file":"Validatable.js","sourceRoot":"","sources":["../../src/viewModels/Validatable.ts"],"names":[],"mappings":";;;;AAAA,+BAAkD;AAClD,8CAA6G;AAC7G,4CAA4C;AAO5C,MAAsB,oBAAoB;IAUtC,YAAY,MAAyB;QAR7B,eAAU,GAAmB,IAAI,CAAC;QAClC,aAAQ,GAA4B,IAAI,CAAC;QAGzC,WAAM,GAAW,IAAI,CAAC;QAEtB,qBAAgB,GAAoB,IAAI,CAAC;QAG7C,qBAAc,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,6BAAgB,CAAC,IAAI,CAAC,CAAC;QAChF,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC;IAC5C,CAAC;IAID,IAAI,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtC,IAAI,KAAK,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAEnC,KAAK,CAAC,QAAQ;;QACV,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,OAAO,IAAI,CAAC;SACf;QAED,IAAI;YACA,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAC,IAAI,CAAC,eAAe,mCAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACzE,IAAI,CAAC,gBAAgB,GAAG,KAAK,KAAK,6BAAgB,CAAC,IAAI;gBACnD,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,IAAI,4BAAe,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;SACrD;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,gBAAgB,GAAG,GAAsB,CAAC;SAClD;QAED,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;SACtB;aAAM;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACxC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACtD;QACD,OAAO,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC;IACzC,CAAC;IAED,KAAK;QACD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,YAAoC,EAAE,UAAU,GAAG,IAAI;QAC9E,IAAI,UAAU,EAAE;YACZ,OAAO,kBAAS,CAAC,YAAY,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;SACpE;QAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACvE,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;CACJ;AApDG;IADC,iBAAU;;oDACmB;AANlC,oDA0DC"}
+{"version":3,"file":"Validatable.js","sourceRoot":"","sources":["../../src/viewModels/Validatable.ts"],"names":[],"mappings":";;;;AAAA,+BAA0D;AAC1D,8CAA6G;AAC7G,4CAA4C;AAU5C,MAAM,cAAc,GAAG,GAAG,EAAE,CAAC,6BAAgB,CAAC,IAAI,CAAC;AACnD,MAAsB,gBAAgB;IAUlC,YAAY,MAA4B;QARhC,eAAU,GAAgC,IAAI,CAAC;QAC/C,aAAQ,GAA4B,IAAI,CAAC;QAGzC,WAAM,GAAW,IAAI,CAAC;QAEtB,qBAAgB,GAAoB,IAAI,CAAC;QAG7C,qBAAc,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAID,IAAI,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtC,IAAI,KAAK,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAE5B,mBAAmB,CAAC,MAA4B;QACnD,IAAI,CAAC,UAAU,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,KAAI,cAAc,CAAC;QACtD,IAAI,CAAC,QAAQ,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,QAAQ;QACV,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,OAAO,IAAI,CAAC;SACf;QAED,IAAI;YACA,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC1D,IAAI,CAAC,gBAAgB,GAAG,KAAK,KAAK,6BAAgB,CAAC,IAAI;gBACnD,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,IAAI,4BAAe,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;SACrD;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,gBAAgB,GAAG,GAAsB,CAAC;SAClD;QAED,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;SACtB;aAAM;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACxC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACtD;QACD,OAAO,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,YAAY;QACd,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpC,OAAO,CAAC,KAAK,CAAC;IAClB,CAAC;IAGD,KAAK;QACD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,YAAuD,EAAE,UAAU,GAAG,IAAI;QACjG,IAAI,UAAU,EAAE;YACZ,OAAO,kBAAS,CAAC,YAAY,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;SACpE;QAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACvE,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;CACJ;AA/DG;IADC,iBAAU;;gDACmB;AAkD9B;IADC,aAAM;;;;6CAIN;AA3DL,4CAqEC"}

package/lib/viewModels/ValuesCollector.d.ts

@@ -0,0 +1,28 @@
+export interface IValueModel<TValue> {
+    value: TValue;
+}
+export interface IValueCollector<TSource, TValue> {
+    getValue(source: TSource): TValue;
+    setValue(source: TSource, value: TValue): void;
+}
+declare type SimpleCollector<T> = {
+    get: () => T;
+    set: (t: T) => void;
+};
+export declare type ModelCollectorsMap<T> = {
+    [P in keyof T]?: IValueModel<T[P]>;
+};
+export declare type CollectorsMap<T> = {
+    [P in keyof T]?: SimpleCollector<T[P]>;
+};
+export declare class ModelCollector<T extends Object> {
+    private readonly _collectors;
+    addModels(models: ModelCollectorsMap<T>): this;
+    addModel<TKey extends keyof T, TSource extends IValueModel<T[TKey]>>(key: TKey, source: TSource): this;
+    addCollector<TKey extends keyof T, TModel, TCollector extends IValueCollector<TModel, T[TKey]>>(key: TKey, model: TModel, collector: TCollector): this;
+    remove(key: keyof T): this;
+    collect(): T;
+    populate(data: T): void;
+}
+export {};
+//# sourceMappingURL=ValuesCollector.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ValuesCollector.d.ts","sourceRoot":"","sources":["../../src/viewModels/ValuesCollector.ts"],"names":[],"mappings":"AACA,MAAM,WAAW,WAAW,CAAC,MAAM;IAC/B,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe,CAAC,OAAO,EAAE,MAAM;IAC5C,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAClD;AAED,aAAK,eAAe,CAAC,CAAC,IAAI;IACtB,GAAG,EAAE,MAAM,CAAC,CAAC;IACb,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC;CACvB,CAAC;AAMF,oBAAY,kBAAkB,CAAC,CAAC,IAAI;KAC/B,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACrC,CAAC;AAEF,oBAAY,aAAa,CAAC,CAAC,IAAI;KAC1B,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACzC,CAAC;AAEF,qBAAa,cAAc,CAAC,CAAC,SAAS,MAAM;IAExC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+B;IAEpD,SAAS,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAKvC,QAAQ,CAAC,IAAI,SAAS,MAAM,CAAC,EAAE,OAAO,SAAS,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO;IAS/F,YAAY,CAAC,IAAI,SAAS,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,SAAS,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU;IAS/I,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC;IAMnB,OAAO,IAAI,CAAC;IAYZ,QAAQ,CAAC,IAAI,EAAE,CAAC;CAW1B"}

package/lib/viewModels/ValuesCollector.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModelCollector = void 0;
+class ModelCollector {
+    constructor() {
+        this._collectors = {};
+    }
+    addModels(models) {
+        Object.entries(models).forEach(pair => this.addModel(pair[0], pair[1]));
+        return this;
+    }
+    addModel(key, source) {
+        this._collectors[key] = {
+            get: () => source.value,
+            set: v => { source.value = v; },
+        };
+        return this;
+    }
+    addCollector(key, model, collector) {
+        this._collectors[key] = {
+            get: () => collector.getValue(model),
+            set: v => collector.setValue(model, v),
+        };
+        return this;
+    }
+    remove(key) {
+        delete this._collectors[key];
+        return this;
+    }
+    collect() {
+        const res = {};
+        Object.entries(this._collectors).forEach(pair => {
+            const key = pair[0];
+            const collector = pair[1];
+            res[key] = collector.get();
+        });
+        return res;
+    }
+    populate(data) {
+        Object.entries(data).forEach(pair => {
+            const key = pair[0];
+            const value = pair[1];
+            const collector = this._collectors[key];
+            if (collector) {
+                collector.set(value);
+            }
+        });
+    }
+}
+exports.ModelCollector = ModelCollector;
+//# sourceMappingURL=ValuesCollector.js.map

package/lib/viewModels/ValuesCollector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ValuesCollector.js","sourceRoot":"","sources":["../../src/viewModels/ValuesCollector.ts"],"names":[],"mappings":";;;AA2BA,MAAa,cAAc;IAA3B;QAEqB,gBAAW,GAA2B,EAAG,CAAC;IAsD/D,CAAC;IApDU,SAAS,CAAC,MAA6B;QAC1C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACnF,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,QAAQ,CAA6D,GAAS,EAAE,MAAe;QAClG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG;YACpB,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK;YACvB,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;SAClC,CAAC;QAEF,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,YAAY,CAAoF,GAAS,EAAE,KAAa,EAAE,SAAqB;QAClJ,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG;YACpB,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;YACpC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;SACzC,CAAC;QAEF,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,MAAM,CAAC,GAAY;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAE7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,OAAO;QACV,MAAM,GAAG,GAAG,EAAQ,CAAC;QAErB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAY,CAAC;YAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAgC,CAAC;YACzD,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,QAAQ,CAAC,IAAO;QACnB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAChC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAY,CAAC;YAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAe,CAAC;YAEpC,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,SAAS,EAAE;gBACX,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aACxB;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAxDD,wCAwDC"}

package/lib/viewModels/index.d.ts

@@ -1,7 +1,9 @@
-export * from './PromptModalViewModel';
-export * from './RadioButtonGroupViewModel';
-export * from './RadioButtonViewModel';
-export * from './SelectViewModel';
-export * from './TextInputViewModel';
 export * from './Validatable';
+export * from './TextModel';
+export * from './FlagModel';
+export * from './NumberModel';
+export * from './wrappers';
+export * from './SelectModel';
+export * from './MultiSelectModel';
+export * from './PromptModalViewModel';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/viewModels/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/viewModels/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAE3B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AAEnC,cAAc,wBAAwB,CAAC"}

package/lib/viewModels/index.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./PromptModalViewModel"), exports);
-tslib_1.__exportStar(require("./RadioButtonGroupViewModel"), exports);
-tslib_1.__exportStar(require("./RadioButtonViewModel"), exports);
-tslib_1.__exportStar(require("./SelectViewModel"), exports);
-tslib_1.__exportStar(require("./TextInputViewModel"), exports);
 tslib_1.__exportStar(require("./Validatable"), exports);
+tslib_1.__exportStar(require("./TextModel"), exports);
+tslib_1.__exportStar(require("./FlagModel"), exports);
+tslib_1.__exportStar(require("./NumberModel"), exports);
+tslib_1.__exportStar(require("./wrappers"), exports);
+tslib_1.__exportStar(require("./SelectModel"), exports);
+tslib_1.__exportStar(require("./MultiSelectModel"), exports);
+tslib_1.__exportStar(require("./PromptModalViewModel"), exports);
 //# sourceMappingURL=index.js.map

package/lib/viewModels/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/viewModels/index.ts"],"names":[],"mappings":";;;AAAA,iEAAuC;AACvC,sEAA4C;AAC5C,iEAAuC;AACvC,4DAAkC;AAClC,+DAAqC;AACrC,wDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/viewModels/index.ts"],"names":[],"mappings":";;;AAAA,wDAA8B;AAC9B,sDAA4B;AAC5B,sDAA4B;AAC5B,wDAA8B;AAC9B,qDAA2B;AAE3B,wDAA8B;AAC9B,6DAAmC;AAEnC,iEAAuC"}

package/lib/viewModels/wrappers.d.ts

@@ -0,0 +1,15 @@
+import { Getter } from '../types';
+import { IValueModel } from './ValuesCollector';
+export interface ILabel<T> {
+    readonly label: T;
+}
+export declare function withLabel<T, TModel extends IValueModel<T>, TLabel = string>(model: TModel, label: Getter<TLabel>): TModel & ILabel<TLabel>;
+export declare function inject<T, TModel extends IValueModel<T>>(model: TModel, source: IValueModel<T>): TModel;
+export declare function wrap<T, TModel extends IValueModel<T>, TRes>(model: TModel, getter: (m: TModel) => TRes, setter: (v: TRes, model: TModel) => void): IValueModel<TRes>;
+declare type LabeledModel<T, TModel extends IValueModel<T>, TLabel = string> = TModel & ILabel<TLabel>;
+interface LabeledModelCtor<T, TModel extends IValueModel<T>, TLabel = string> {
+    new (label?: Getter<TLabel>, initial?: T): LabeledModel<T, TModel, TLabel>;
+}
+export declare function mixinLabel<T, TModel extends IValueModel<T>, TLabel = string>(Superclass: new (initial?: T) => TModel): LabeledModelCtor<T, TModel, TLabel>;
+export {};
+//# sourceMappingURL=wrappers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"wrappers.d.ts","sourceRoot":"","sources":["../../src/viewModels/wrappers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,MAAM,CAAC,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;CACrB;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,SAAS,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,2BAShH;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,SAAS,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,UAS7F;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,MAAM,SAAS,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAKpK;AAED,aAAK,YAAY,CAAC,CAAC,EAAE,MAAM,SAAS,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;AAE/F,UAAU,gBAAgB,CAAC,CAAC,EAAE,MAAM,SAAS,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IACxE,KAAK,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9E;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,SAAS,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,UAAU,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,KAAK,MAAM,GAAG,gBAAgB,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAU1J"}

package/lib/viewModels/wrappers.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mixinLabel = exports.wrap = exports.inject = exports.withLabel = void 0;
+const types_1 = require("../types");
+function withLabel(model, label) {
+    const _label = label;
+    Object.defineProperty(model, 'label', {
+        configurable: true,
+        enumerable: false,
+        get() { return types_1.Getter.getValue(_label); },
+    });
+    return model;
+}
+exports.withLabel = withLabel;
+function inject(model, source) {
+    Object.defineProperty(model, 'value', {
+        configurable: true,
+        enumerable: false,
+        get() { return source.value; },
+        set(v) { source.value = v; },
+    });
+    return model;
+}
+exports.inject = inject;
+function wrap(model, getter, setter) {
+    return {
+        get value() { return getter(model); },
+        set value(v) { setter(v, model); },
+    };
+}
+exports.wrap = wrap;
+function mixinLabel(Superclass) {
+    // @ts-ignore
+    class Sub extends Superclass {
+        constructor(label, initial) {
+            super(initial);
+            withLabel(this, label);
+        }
+    }
+    return Sub;
+}
+exports.mixinLabel = mixinLabel;
+//# sourceMappingURL=wrappers.js.map

package/lib/viewModels/wrappers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrappers.js","sourceRoot":"","sources":["../../src/viewModels/wrappers.ts"],"names":[],"mappings":";;;AAAA,oCAAkC;AAOlC,SAAgB,SAAS,CAAoD,KAAa,EAAE,KAAqB;IAC7G,MAAM,MAAM,GAAG,KAAK,CAAC;IACrB,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE;QAClC,YAAY,EAAE,IAAI;QAClB,UAAU,EAAE,KAAK;QACjB,GAAG,KAAK,OAAO,cAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;KAC5C,CAAC,CAAC;IAEH,OAAO,KAAgC,CAAC;AAC5C,CAAC;AATD,8BASC;AAED,SAAgB,MAAM,CAAmC,KAAa,EAAE,MAAsB;IAC1F,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE;QAClC,YAAY,EAAE,IAAI;QAClB,UAAU,EAAE,KAAK;QACjB,GAAG,KAAK,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9B,GAAG,CAAC,CAAI,IAAI,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;KAClC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACjB,CAAC;AATD,wBASC;AAED,SAAgB,IAAI,CAAyC,KAAa,EAAE,MAA2B,EAAE,MAAwC;IAC7I,OAAO;QACH,IAAI,KAAK,KAAK,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,KAAK,CAAC,CAAO,IAAI,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;KAC3C,CAAC;AACN,CAAC;AALD,oBAKC;AAQD,SAAgB,UAAU,CAAoD,UAAuC;IACjH,aAAa;IACb,MAAM,GAAI,SAAQ,UAAU;QACxB,YAAY,KAAqB,EAAE,OAAW;YAC1C,KAAK,CAAC,OAAO,CAAC,CAAC;YACf,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3B,CAAC;KACJ;IAED,OAAO,GAAU,CAAC;AACtB,CAAC;AAVD,gCAUC"}

package/package.json

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

package/src/types.ts

@@ -3,3 +3,19 @@ export { DeepPartial } from './deepPartial';
 export type DeepReadonly<T> = {
     readonly [P in keyof T]: DeepReadonly<T[P]>;
 };
+
+export type Getter<T> = (() => T) | T | null;
+
+export namespace Getter {
+    export function getValue<T>(getter: Getter<T>): T {
+        if (getter == null) {
+            return null;
+        }
+        if (typeof getter === 'function') {
+            return (getter as () => T)();
+        }
+        return getter;
+    }
+}
+
+export type Predicate<T> = (value: T) => boolean;

package/src/viewModels/FlagModel.ts

@@ -0,0 +1,43 @@
+import { action, makeObservable, observable } from 'mobx';
+import { ILabel } from './wrappers';
+import { IValueModel } from './ValuesCollector';
+
+export interface IFlagModel extends IValueModel<boolean> {
+    toggle(): void;
+    reset(): void;
+}
+
+export type IFlagModelReadonly = {
+    readonly value: boolean;
+};
+
+export type ILabeledFlagModel = IFlagModel & ILabel<string>;
+
+export class FlagModel implements IFlagModel, IFlagModelReadonly {
+
+    @observable
+    private _value: boolean = false;
+
+    constructor(initial = false) {
+        makeObservable(this);
+        this._value = initial;
+    }
+
+    get value() {
+        return this._value;
+    }
+
+    set value(value: boolean) {
+        this._value = value;
+    }
+
+    @action
+    toggle = () => {
+        this._value = !this._value;
+    };
+
+    @action
+    reset = () => {
+        this._value = false;
+    };
+}