@zajno/common 1.3.12 → 1.3.16

package/lib/viewModels/Validatable.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zajno/common",
-  "version": "1.3.12",
+  "version": "1.3.16",
   "description": "Zajno's re-usable utilities for JS/TS projects",
   "repository": {
     "type": "git",
@@ -21,7 +21,9 @@
     "lint": "eslint \"src/**/*.ts?(x)\"",
     "test": "yarn jest --clearCache && yarn jest"
   },
-  "dependencies": {},
+  "dependencies": {
+    "rimraf": "^3"
+  },
   "devDependencies": {
     "@types/faker": "^5.5.9",
     "@types/jest": "^27.0.2",
@@ -32,7 +34,6 @@
     "fast-check": "^2.18.0",
     "jest": "^27.3.1",
     "mobx": "^6",
-    "rimraf": "^3.0.2",
     "ts-jest": "^27.0.7",
     "ts-node": "^10.3.1",
     "tslib": "^2.2.0",

package/src/disposer.ts

@@ -59,9 +59,12 @@ export class Disposer {
             );
         }
 
-        this._disposers.forEach(d => d());
+        const copy = this._disposers.slice().reverse();
         this._disposers.length = 0;
         this._map.clear();
+
+        // this should separate side effects
+        copy.forEach(d => d());
     }
 }
 

package/src/lazy.light.ts

@@ -1,5 +1,6 @@
+import type { IDisposable } from './disposer';
 
-export type LazyLight<T> = {
+export type LazyLight<T> = IDisposable & {
     readonly value: T;
     readonly hasValue: boolean;
 
@@ -7,19 +8,22 @@ export type LazyLight<T> = {
 };
 
 export function createLazy<T>(factory: () => T) {
-    return {
-        _factory: factory,
-        _instance: undefined as T,
+    const _factory = factory;
+    let _instance: T = undefined;
+
+    const res: LazyLight<T> = {
         get value() {
-            if (this._instance === undefined) {
-                this._instance = this._factory();
+            if (_instance === undefined) {
+                _instance = _factory();
             }
-            return this._instance;
+            return _instance;
         },
-        get hasValue() { return this._instance !== undefined; },
-        reset() {
-            this._instance = undefined;
+        get hasValue() { return _instance !== undefined; },
+        reset: () => {
+            _instance = undefined;
         },
+        dispose: () => res.reset(),
+    };
 
-    } as LazyLight<T>;
+    return res;
 }

package/src/lazy.ts

@@ -1,6 +1,7 @@
-import { observable, transaction, makeObservable } from 'mobx';
+import type { IDisposable } from 'disposer';
+import { observable, makeObservable, action } from 'mobx';
 
-export default class Lazy<T> {
+export default class Lazy<T> implements IDisposable {
 
     @observable.ref
     private _instance: T = null;
@@ -25,9 +26,11 @@ export default class Lazy<T> {
     reset() {
         this._instance = null;
     }
+
+    dispose = () => this.reset();
 }
 
-export class LazyPromise<T> {
+export class LazyPromise<T> implements IDisposable {
 
     @observable.ref
     private _instance: T = null;
@@ -50,23 +53,27 @@ export class LazyPromise<T> {
     get() {
         if (!this._loaded && !this._busy) {
             this._busy = true;
-            this._factory().then(res => {
-                transaction(() => {
-                    this._busy = false;
-                    this._loaded = true;
-                    this._instance = res;
-                });
-            });
+            this._factory().then(this.setInstance);
         }
 
         return this._instance;
     }
 
+    @action
+    private setInstance = (res: T) => {
+        const wasBusy = this._busy;
+
+        this._busy = false;
+        this._loaded = wasBusy;
+        this._instance = wasBusy ? res : null;
+    };
+
+    @action
     reset() {
-        transaction(() => {
-            this._busy = false;
-            this._instance = this.initial;
-            this._loaded = false;
-        });
+        this._busy = false;
+        this._instance = this.initial;
+        this._loaded = false;
     }
+
+    dispose = () => this.reset();
 }

package/src/pool.ts

@@ -1,24 +1,47 @@
+import { safeCall } from 'functions';
+import type { IDisposable } from './disposer';
 
 export class Pool<T> {
 
-    private _container: T[] = [];
+    private readonly _container: T[] = [];
 
-    get(factory: () => T): T {
+    constructor(readonly factory: () => T) { }
+
+    public get(): T {
         if (this._container.length > 0) {
             return this._container.pop();
         } else {
-            return factory();
+            return this.factory();
         }
     }
 
-    release(e: T): void;
-    release(e: T[]): void;
-
-    release(e: T | T[]) {
+    public release(e: T | T[]): void {
         if (Array.isArray(e)) {
             this._container.push(...e);
-        } else {
+        } else if (e) {
             this._container.push(e);
         }
     }
 }
+
+export class PoolDisposable<T extends IDisposable> extends Pool<T> {
+
+    constructor(factory: () => T, readonly initializer: (item: T) => void = null) {
+        super(factory);
+    }
+
+    public get(): T {
+        const res = super.get();
+        safeCall(this.initializer, res);
+        return res;
+    }
+
+    public release(e: T | T[]): void {
+        if (Array.isArray(e)) {
+            e.forEach(ee => ee.dispose());
+        } else if (e) {
+            e.dispose();
+        }
+        return super.release(e);
+    }
+}

package/src/validation/types.ts

@@ -1,14 +1,14 @@
 import { ValidationErrors } from './ValidationErrors';
 
-export type ValidatorFunction<T = string> = (val: T) => ValidationErrors;
-export type ValidatorFunctionAsync<T = string> = (val: T) => Promise<ValidationErrors>;
+export type ValidatorFunction<T = string, TErrors = ValidationErrors> = (val: T) => TErrors;
+export type ValidatorFunctionAsync<T = string, TErrors = ValidationErrors> = (val: T) => Promise<TErrors>;
 
 export type WrapperFunction = (val: ValidatorFunction) => ValidatorFunction;
 
-export class ValidationError extends Error {
-    readonly code: ValidationErrors = null;
+export class ValidationError<TErrors = ValidationErrors> extends Error {
+    readonly code: TErrors = null;
 
-    constructor(message: string, code: ValidationErrors) {
+    constructor(message: string, code: TErrors) {
         super(message);
         this.code = code;
     }

package/src/viewModels/FlagModel.ts

@@ -27,9 +27,14 @@ export class FlagModel implements IFlagModel, IFlagModelReadonly {
     }
 
     set value(value: boolean) {
-        this._value = value;
+        this.setValue(value);
     }
 
+    @action
+    public readonly setValue = (value: boolean) => {
+        this._value = value;
+    };
+
     get isDefault() { return this._value === false; }
 
     @action

package/src/viewModels/NumberModel.ts

@@ -20,7 +20,12 @@ export class NumberModel implements INumberModel, IValueModel<number> {
     }
 
     get value() { return this._value; }
-    set value(v: number) { this._value = v; }
+    set value(v: number) { this.setValue(v); }
+
+    @action
+    public readonly setValue = (v: number) => {
+        this._value = v;
+    };
 
     get isDefault() { return this._value === this._initial; }
 

package/src/viewModels/TextModel.ts

@@ -1,8 +1,8 @@
-import { observable, computed, makeObservable, reaction } from 'mobx';
+import { observable, makeObservable, reaction, action } from 'mobx';
 import { Getter } from '../types';
 import { IValueModel } from './types';
 import logger from '../logger';
-import { ValidatableModel, ValidationConfig } from './Validatable';
+import { ValidatableModel } from './Validatable';
 import { IResetableModel } from 'viewModels';
 
 export type TextInputConfig = {
@@ -11,7 +11,6 @@ export type TextInputConfig = {
     value?: Getter<string>;
     async?: boolean;
 
-    validation?: ValidationConfig<string>;
     noSubscribe?: boolean;
 };
 
@@ -40,23 +39,20 @@ export class Text {
     get value() { return this._value; }
 }
 
-export class TextInputVM extends ValidatableModel implements IValueModel<string>, IResetableModel {
+export class TextInputVM extends ValidatableModel<string> implements IValueModel<string>, IResetableModel {
     @observable
     private _value = '';
 
     @observable
     private _focused = false;
 
-    @observable
     private _name: string = null;
-
-    @observable
     private _title: string = null;
 
     private readonly _valueObserving: () => void = null;
 
     constructor(config?: TextInputConfig) {
-        super(config && config.validation);
+        super();
         makeObservable(this);
         config = config || {};
 
@@ -72,14 +68,18 @@ export class TextInputVM extends ValidatableModel implements IValueModel<string>
     get title() { return this._title; }
 
     set value(val) {
+        this.setValue(val);
+    }
+
+    @action
+    public readonly setValue = (value: string) => {
         if (!this._valueObserving) {
-            this._value = val;
+            this._value = value;
         } else {
             logger.warn('[TextInputViewModel] Setting value is not allowed when value is observing');
         }
-    }
+    };
 
-    @computed
     get isEmpty() {
         return !this._value;
     }
@@ -88,15 +88,20 @@ export class TextInputVM extends ValidatableModel implements IValueModel<string>
         return this._focused;
     }
 
-    set focused(val) {
-        this._focused = val;
-        if (!val) {
+    set focused(val: boolean) {
+        this.setFocused(val);
+    }
+
+    @action
+    public readonly setFocused = (value = true) => {
+        this._focused = value;
+        if (!value) {
             this.onBlur();
             return;
         }
 
         super.reset();
-    }
+    };
 
     protected get valueToValidate() { return (this.value ?? '').trim(); }
 

package/src/viewModels/Validatable.ts

@@ -1,29 +1,29 @@
-import { observable, makeObservable, action } from 'mobx';
+import { observable, makeObservable, action, runInAction } from 'mobx';
 import { ValidatorFunction, ValidatorFunctionAsync, ValidationErrors, ValidationError } from '../validation';
 import { someAsync } from '../async/arrays';
 
-export type ValueValidator<T> = ValidatorFunction<T> | ValidatorFunctionAsync<T>;
-export type ValidationErrorsStrings = { [code: number]: string };
+export type ValueValidator<T, TErrors = ValidationErrors> = ValidatorFunction<T, TErrors> | ValidatorFunctionAsync<T, TErrors>;
+export type ValidationErrorsStrings<TErrors extends string | number = number> = Record<TErrors, string>;
 
-export type ValidationConfig<T> = {
-    validator: ValueValidator<Readonly<T>>,
-    errors: ValidationErrorsStrings,
+export type ValidationConfig<T, TErrors extends string | number = ValidationErrors> = {
+    validator: ValueValidator<Readonly<T>, TErrors>,
+    errors: ValidationErrorsStrings<TErrors>,
 };
 
-const EmptyValidator = () => ValidationErrors.None;
+const EmptyValidator = () => 0;
+
 export abstract class ValidatableModel<T = string> {
 
-    private _validator: ValueValidator<Readonly<T>> = null;
-    private _strings: ValidationErrorsStrings = null;
+    private _validator: ValueValidator<Readonly<T>, any> = null;
+    private _strings: ValidationErrorsStrings<any> = null;
 
     @observable
     private _error: string = null;
 
     private _validationError: ValidationError = null;
 
-    constructor(config?: ValidationConfig<T>) {
+    constructor() {
         makeObservable(this);
-        this.setValidationConfig(config);
     }
 
     protected abstract get valueToValidate(): Readonly<T>;
@@ -32,7 +32,7 @@ export abstract class ValidatableModel<T = string> {
 
     get error() { return this._error; }
 
-    public setValidationConfig(config?: ValidationConfig<T>) {
+    public setValidationConfig<TErrors extends string | number = ValidationErrors>(config?: ValidationConfig<T, TErrors>) {
         this._validator = config?.validator || EmptyValidator;
         this._strings = config?.errors;
         return this;
@@ -52,20 +52,22 @@ export abstract class ValidatableModel<T = string> {
         }
 
         try {
-            const valid = await this._validator(this.valueToValidate);
-            this._validationError = valid === ValidationErrors.None
+            const validationResult = await this._validator(this.valueToValidate);
+            this._validationError = !validationResult
                 ? null
-                : new ValidationError('Unknown error', valid);
+                : new ValidationError('Unknown error', validationResult);
         } catch (err) {
             this._validationError = err as ValidationError;
         }
 
-        if (!this._validationError) {
-            this._error = null;
-        } else {
-            const code = this._validationError.code;
-            this._error = this._strings && this._strings[code];
-        }
+        runInAction(() => {
+            if (!this._validationError) {
+                this._error = null;
+            } else {
+                const code = this._validationError.code;
+                this._error = this._strings && this._strings[code];
+            }
+        });
         return this._validationError == null;
     }