@zajno/common 1.3.5 → 1.3.9

package/lib/math/calc.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.random = exports.roundHalf = exports.roundNumber = exports.getIntersection = exports.contains = exports.clamp01 = exports.clamp = void 0;
+exports.badRandomString = exports.random = exports.roundHalf = exports.roundNumber = exports.getIntersection = exports.contains = exports.clamp01 = exports.clamp = void 0;
 function clamp(val, min = undefined, max = undefined, cycle = false) {
     if (min != null && val < min) {
         return (max != null && cycle) ? max : min;
@@ -67,4 +67,8 @@ function random(min = 0, max = 1, trunc = true) {
     return trunc ? Math.trunc(res) : res;
 }
 exports.random = random;
+function badRandomString(length = 12) {
+    return Math.random().toString(26).slice(2, clamp(length, 0, 12));
+}
+exports.badRandomString = badRandomString;
 //# sourceMappingURL=calc.js.map

package/lib/math/calc.js.map

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

package/lib/transitionObserver.d.ts

@@ -1,5 +1,5 @@
 import { IEvent } from './event';
-import { IDisposable } from './unsubscriber';
+import { IDisposable } from './disposer';
 export declare class TransitionObserver<T> implements IDisposable {
     private readonly _event;
     private _getter;

package/lib/transitionObserver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transitionObserver.d.ts","sourceRoot":"","sources":["../src/transitionObserver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAS,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,kBAAkB,CAAC,CAAC,CAAE,YAAW,WAAW;IAErD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,KAAK,CAAgB;IAE7B,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,GAAG,CAAgB;IAE3B,OAAO,CAAC,GAAG,CAAgB;IAC3B,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,QAAQ,CAAoB;IACpC,OAAO,CAAC,cAAc,CAA4B;IAElD,OAAO,CAAC,MAAM,CAAoC;gBAEtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAM5B,IAAW,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,CAAwB;IACrD,IAAW,YAAY,MAAyB;IAEhD,IAAW,WAAW,YAAqC;IAC3D,OAAO,KAAK,WAAW,GAA0C;IAEjE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC;IAQvB,IAAI,CAAC,IAAI,EAAE,CAAC;IAKZ,EAAE,CAAC,EAAE,EAAE,CAAC;IAKR,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG;IAQpB,SAAS;IAOT,QAAQ,CAAC,MAAM,UAAO;IAKtB,UAAU;IAIV,aAAa;IAKb,UAAU,CAAC,OAAO,GAAE,MAAa;IA2BjC,OAAO;IAMP,aAAa,CAAC,IAAI,EAAE,MAAM;IAK1B,OAAO,aASL;IAEF,OAAO,CAAC,WAAW,CAiCjB;IAEF,OAAO,CAAC,cAAc;CAQzB"}
+{"version":3,"file":"transitionObserver.d.ts","sourceRoot":"","sources":["../src/transitionObserver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAS,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,qBAAa,kBAAkB,CAAC,CAAC,CAAE,YAAW,WAAW;IAErD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,KAAK,CAAgB;IAE7B,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,GAAG,CAAgB;IAE3B,OAAO,CAAC,GAAG,CAAgB;IAC3B,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,QAAQ,CAAoB;IACpC,OAAO,CAAC,cAAc,CAA4B;IAElD,OAAO,CAAC,MAAM,CAAoC;gBAEtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAM5B,IAAW,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,CAAwB;IACrD,IAAW,YAAY,MAAyB;IAEhD,IAAW,WAAW,YAAqC;IAC3D,OAAO,KAAK,WAAW,GAA0C;IAEjE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC;IAQvB,IAAI,CAAC,IAAI,EAAE,CAAC;IAKZ,EAAE,CAAC,EAAE,EAAE,CAAC;IAKR,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG;IAQpB,SAAS;IAOT,QAAQ,CAAC,MAAM,UAAO;IAKtB,UAAU;IAIV,aAAa;IAKb,UAAU,CAAC,OAAO,GAAE,MAAa;IA2BjC,OAAO;IAMP,aAAa,CAAC,IAAI,EAAE,MAAM;IAK1B,OAAO,aASL;IAEF,OAAO,CAAC,WAAW,CAiCjB;IAEF,OAAO,CAAC,cAAc;CAQzB"}

package/lib/unsubscriber.d.ts

@@ -1,17 +1,2 @@
-export interface IDisposable {
-    dispose(): void;
-}
-export interface Disposer {
-    (): void;
-}
-export declare class Unsubscriber {
-    readonly logName: string;
-    private readonly _disposers;
-    private readonly _map;
-    constructor(logName?: string);
-    add(d: Disposer | IDisposable, id?: string): void;
-    execute(id: string): void;
-    dispose(log?: boolean): void;
-}
-export declare function combineDisposers(...items: Disposer[]): Disposer;
+export { IDisposable, DisposeFunction as Disposer, combineDisposers, Disposer as Unsubscriber, Disposable, } from './disposer';
 //# sourceMappingURL=unsubscriber.d.ts.map

package/lib/unsubscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unsubscriber.d.ts","sourceRoot":"","sources":["../src/unsubscriber.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,WAAW;IACxB,OAAO,IAAI,IAAI,CAAC;CACnB;AAED,MAAM,WAAW,QAAQ;IACrB,IAAI,IAAI,CAAC;CACZ;AAED,qBAAa,YAAY;IAKT,QAAQ,CAAC,OAAO,EAAE,MAAM;IAHpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA+B;gBAE/B,OAAO,GAAE,MAAa;IAE3C,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,WAAW,EAAE,EAAE,CAAC,EAAE,MAAM;IAqB1C,OAAO,CAAC,EAAE,EAAE,MAAM;IAelB,OAAO,CAAC,GAAG,UAAQ;CAYtB;AAED,wBAAgB,gBAAgB,CAAC,GAAG,KAAK,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAE/D"}
+{"version":3,"file":"unsubscriber.d.ts","sourceRoot":"","sources":["../src/unsubscriber.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,WAAW,EACX,eAAe,IAAI,QAAQ,EAC3B,gBAAgB,EAChB,QAAQ,IAAI,YAAY,EACxB,UAAU,GACb,MAAM,YAAY,CAAC"}

package/lib/unsubscriber.js

@@ -1,54 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.combineDisposers = exports.Unsubscriber = void 0;
+exports.Disposable = exports.Unsubscriber = exports.combineDisposers = void 0;
 const tslib_1 = require("tslib");
 const logger_1 = tslib_1.__importDefault(require("./logger"));
-class Unsubscriber {
-    constructor(logName = null) {
-        this.logName = logName;
-        this._disposers = [];
-        this._map = new Map();
-    }
-    add(d, id) {
-        if (!d) {
-            return;
-        }
-        const dd = typeof d !== 'function'
-            ? (() => d.dispose ? d.dispose() : null)
-            : d;
-        this._disposers.push(dd);
-        if (id) {
-            // dispose previous identified disposer
-            if (this._map.has(id)) {
-                this.execute(id);
-            }
-            this._map.set(id, dd);
-        }
-    }
-    execute(id) {
-        const d = this._map.get(id);
-        if (!d) {
-            return;
-        }
-        this._map.delete(id);
-        const i = this._disposers.indexOf(d);
-        if (i >= 0) {
-            this._disposers.splice(i, 1);
-        }
-        d();
-    }
-    dispose(log = false) {
-        if (log) {
-            logger_1.default.log(`[Disposer:${this.logName || '<unknown>'}] Disposing ${this._disposers.length} items including named ones:`, Array.from(this._map.entries()).map(e => e[0]));
-        }
-        this._disposers.forEach(d => d());
-        this._disposers.length = 0;
-        this._map.clear();
-    }
-}
-exports.Unsubscriber = Unsubscriber;
-function combineDisposers(...items) {
-    return () => items.forEach(i => i());
-}
-exports.combineDisposers = combineDisposers;
+var disposer_1 = require("./disposer");
+Object.defineProperty(exports, "combineDisposers", { enumerable: true, get: function () { return disposer_1.combineDisposers; } });
+Object.defineProperty(exports, "Unsubscriber", { enumerable: true, get: function () { return disposer_1.Disposer; } });
+Object.defineProperty(exports, "Disposable", { enumerable: true, get: function () { return disposer_1.Disposable; } });
+logger_1.default.warn('@zajno/common: importing module "unsusbcriber" is deprecated; please change your import to "disposer" module.');
 //# sourceMappingURL=unsubscriber.js.map

package/lib/unsubscriber.js.map

@@ -1 +1 @@
-{"version":3,"file":"unsubscriber.js","sourceRoot":"","sources":["../src/unsubscriber.ts"],"names":[],"mappings":";;;;AAAA,8DAA8B;AAU9B,MAAa,YAAY;IAKrB,YAAqB,UAAkB,IAAI;QAAtB,YAAO,GAAP,OAAO,CAAe;QAH1B,eAAU,GAAe,EAAE,CAAC;QAC5B,SAAI,GAAG,IAAI,GAAG,EAAoB,CAAC;IAEL,CAAC;IAEhD,GAAG,CAAC,CAAyB,EAAE,EAAW;QACtC,IAAI,CAAC,CAAC,EAAE;YACJ,OAAO;SACV;QAED,MAAM,EAAE,GAAa,OAAO,CAAC,KAAK,UAAU;YACxC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACxC,CAAC,CAAC,CAAC,CAAC;QAER,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEzB,IAAI,EAAE,EAAE;YACJ,uCAAuC;YACvC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBACnB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;aACpB;YAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;SACzB;IACL,CAAC;IAED,OAAO,CAAC,EAAU;QACd,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,CAAC,EAAE;YACJ,OAAO;SACV;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACrB,MAAM,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,EAAE;YACR,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SAChC;QAED,CAAC,EAAE,CAAC;IACR,CAAC;IAED,OAAO,CAAC,GAAG,GAAG,KAAK;QACf,IAAI,GAAG,EAAE;YACL,gBAAM,CAAC,GAAG,CACN,aAAa,IAAI,CAAC,OAAO,IAAI,WAAW,eAAe,IAAI,CAAC,UAAU,CAAC,MAAM,8BAA8B,EAC3G,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjD,CAAC;SACL;QAED,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAClC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACJ;AAvDD,oCAuDC;AAED,SAAgB,gBAAgB,CAAC,GAAG,KAAiB;IACjD,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;AACzC,CAAC;AAFD,4CAEC"}
+{"version":3,"file":"unsubscriber.js","sourceRoot":"","sources":["../src/unsubscriber.ts"],"names":[],"mappings":";;;;AAAA,8DAA8B;AAE9B,uCAMoB;AAHhB,4GAAA,gBAAgB,OAAA;AAChB,wGAAA,QAAQ,OAAgB;AACxB,sGAAA,UAAU,OAAA;AAGd,gBAAM,CAAC,IAAI,CAAC,+GAA+G,CAAC,CAAC"}

package/lib/viewModels/FlagModel.d.ts

@@ -13,6 +13,8 @@ export declare class FlagModel implements IFlagModel, IFlagModelReadonly {
     get value(): boolean;
     set value(value: boolean);
     get isDefault(): boolean;
+    setTrue: () => boolean;
+    setFalse: () => boolean;
     toggle: () => void;
     reset: () => void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"FlagModel.d.ts","sourceRoot":"","sources":["../../src/viewModels/FlagModel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE9C,MAAM,WAAW,UAAW,SAAQ,WAAW,CAAC,OAAO,CAAC,EAAE,eAAe;IACrE,MAAM,IAAI,IAAI,CAAC;CAClB;AAED,oBAAY,kBAAkB,GAAG;IAC7B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,oBAAY,iBAAiB,GAAG,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;AAE5D,qBAAa,SAAU,YAAW,UAAU,EAAE,kBAAkB;IAG5D,OAAO,CAAC,MAAM,CAAkB;gBAEpB,OAAO,UAAQ;IAK3B,IAAI,KAAK,IAIQ,OAAO,CAFvB;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,OAAO,EAEvB;IAED,IAAI,SAAS,YAAoC;IAGjD,MAAM,aAEJ;IAGF,KAAK,aAEH;CACL"}
+{"version":3,"file":"FlagModel.d.ts","sourceRoot":"","sources":["../../src/viewModels/FlagModel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE9C,MAAM,WAAW,UAAW,SAAQ,WAAW,CAAC,OAAO,CAAC,EAAE,eAAe;IACrE,MAAM,IAAI,IAAI,CAAC;CAClB;AAED,oBAAY,kBAAkB,GAAG;IAC7B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,oBAAY,iBAAiB,GAAG,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;AAE5D,qBAAa,SAAU,YAAW,UAAU,EAAE,kBAAkB;IAG5D,OAAO,CAAC,MAAM,CAAkB;gBAEpB,OAAO,UAAQ;IAK3B,IAAI,KAAK,IAIQ,OAAO,CAFvB;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,OAAO,EAEvB;IAED,IAAI,SAAS,YAAoC;IAGjD,OAAO,gBAIL;IAGF,QAAQ,gBAIN;IAGF,MAAM,aAEJ;IAGF,KAAK,aAEH;CACL"}

package/lib/viewModels/FlagModel.js

@@ -6,6 +6,16 @@ const mobx_1 = require("mobx");
 class FlagModel {
     constructor(initial = false) {
         this._value = false;
+        this.setTrue = () => {
+            const v = this.value;
+            this.value = true;
+            return !v;
+        };
+        this.setFalse = () => {
+            const v = this.value;
+            this.value = false;
+            return v;
+        };
         this.toggle = () => {
             this._value = !this._value;
         };
@@ -27,6 +37,14 @@ tslib_1.__decorate([
     mobx_1.observable,
     tslib_1.__metadata("design:type", Boolean)
 ], FlagModel.prototype, "_value", void 0);
+tslib_1.__decorate([
+    mobx_1.action,
+    tslib_1.__metadata("design:type", Object)
+], FlagModel.prototype, "setTrue", void 0);
+tslib_1.__decorate([
+    mobx_1.action,
+    tslib_1.__metadata("design:type", Object)
+], FlagModel.prototype, "setFalse", void 0);
 tslib_1.__decorate([
     mobx_1.action,
     tslib_1.__metadata("design:type", Object)

package/lib/viewModels/FlagModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"FlagModel.js","sourceRoot":"","sources":["../../src/viewModels/FlagModel.ts"],"names":[],"mappings":";;;;AAAA,+BAA0D;AAc1D,MAAa,SAAS;IAKlB,YAAY,OAAO,GAAG,KAAK;QAFnB,WAAM,GAAY,KAAK,CAAC;QAkBhC,WAAM,GAAG,GAAG,EAAE;YACV,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QAC/B,CAAC,CAAC;QAGF,UAAK,GAAG,GAAG,EAAE;YACT,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACxB,CAAC,CAAC;QAtBE,qBAAc,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,KAAK,CAAC,KAAc;QACpB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,IAAI,SAAS,KAAK,OAAO,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC;CAWpD;AA1BG;IADC,iBAAU;;yCACqB;AAkBhC;IADC,aAAM;;yCAGL;AAGF;IADC,aAAM;;wCAGL;AA5BN,8BA6BC"}
+{"version":3,"file":"FlagModel.js","sourceRoot":"","sources":["../../src/viewModels/FlagModel.ts"],"names":[],"mappings":";;;;AAAA,+BAA0D;AAc1D,MAAa,SAAS;IAKlB,YAAY,OAAO,GAAG,KAAK;QAFnB,WAAM,GAAY,KAAK,CAAC;QAkBhC,YAAO,GAAG,GAAG,EAAE;YACX,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,OAAO,CAAC,CAAC,CAAC;QACd,CAAC,CAAC;QAGF,aAAQ,GAAG,GAAG,EAAE;YACZ,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,OAAO,CAAC,CAAC;QACb,CAAC,CAAC;QAGF,WAAM,GAAG,GAAG,EAAE;YACV,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QAC/B,CAAC,CAAC;QAGF,UAAK,GAAG,GAAG,EAAE;YACT,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACxB,CAAC,CAAC;QApCE,qBAAc,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,KAAK,CAAC,KAAc;QACpB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,IAAI,SAAS,KAAK,OAAO,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC;CAyBpD;AAxCG;IADC,iBAAU;;yCACqB;AAkBhC;IADC,aAAM;;0CAKL;AAGF;IADC,aAAM;;2CAKL;AAGF;IADC,aAAM;;yCAGL;AAGF;IADC,aAAM;;wCAGL;AA1CN,8BA2CC"}

package/package.json

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

package/src/dates/calc.ts

@@ -1,4 +1,4 @@
-import { getTime } from './convert';
+import { getTime } from './parse';
 import { endOf, startOf } from './shift';
 import { Granularity } from './types';
 

package/src/dates/convert.ts

@@ -1,19 +1,8 @@
 import { DateX } from './datex';
+import { getDate, getTime } from './parse';
 import { isSame, startOf } from './shift';
 import { ConstantGranularity, Granularity } from './types';
 
-export function getTime(d: Date | number): number {
-    return d instanceof Date ? d.getTime() : d;
-}
-
-export function getDate(d: Date | number | string): Date {
-    if (!d) {
-        return null;
-    }
-
-    return new Date(d);
-}
-
 type DateFields<T> = {
     [P in keyof T]: T[P] extends Date ? P : never;
 }[keyof T];

package/src/dates/format.ts

@@ -1,5 +1,6 @@
 import * as MathX from '../math';
-import { decompose, decomposeDate, getDate, getDiscreteDiff, getTime } from './convert';
+import { decompose, decomposeDate, getDiscreteDiff } from './convert';
+import { getDate, getTime } from './parse';
 import { YearDate } from './yearDate';
 
 export namespace Format {

package/src/dates/parse.ts

@@ -1,4 +1,16 @@
 
+export function getTime(d: Date | number): number {
+    return d instanceof Date ? d.getTime() : d;
+}
+
+export function getDate(d: Date | number | string): Date {
+    if (!d) {
+        return null;
+    }
+
+    return new Date(d);
+}
+
 export namespace Parse {
     /** `YYYY-MM-DD` */
     export function fromDatePicker(str: string, local = false) {

package/src/dates/shift.ts

@@ -1,4 +1,4 @@
-import { getDate, getTime } from './convert';
+import { getDate, getTime } from './parse';
 import { DateX } from './datex';
 import { ConstantGranularity, Granularity } from './types';
 

package/src/dates/yearDate.ts

@@ -1,4 +1,4 @@
-import { getDate } from './convert';
+import { getDate } from './parse';
 
 /** Useful for recurring dates like birthday */
 export type YearDate = { day: number, month: number };

package/src/disposer.ts

@@ -0,0 +1,81 @@
+import logger from './logger';
+
+export interface IDisposable {
+    dispose(): void;
+}
+
+export interface DisposeFunction {
+    (): void;
+}
+
+export class Disposer {
+
+    private readonly _disposers: DisposeFunction[] = [];
+    private readonly _map = new Map<string, DisposeFunction>();
+
+    constructor(readonly logName: string = null) { }
+
+    add(d: DisposeFunction | IDisposable, id?: string) {
+        if (!d) {
+            return;
+        }
+
+        const dd: DisposeFunction = typeof d !== 'function'
+            ? (() => d.dispose ? d.dispose() : null)
+            : d;
+
+        this._disposers.push(dd);
+
+        if (id) {
+            // dispose previous identified disposer
+            if (this._map.has(id)) {
+                this.execute(id);
+            }
+
+            this._map.set(id, dd);
+        }
+    }
+
+    execute(id: string) {
+        const d = this._map.get(id);
+        if (!d) {
+            return;
+        }
+
+        this._map.delete(id);
+        const i = this._disposers.indexOf(d);
+        if (i >= 0) {
+            this._disposers.splice(i, 1);
+        }
+
+        d();
+    }
+
+    dispose(log = false) {
+        if (log) {
+            logger.log(
+                `[Disposer:${this.logName || '<unknown>'}] Disposing ${this._disposers.length} items including named ones:`,
+                Array.from(this._map.entries()).map(e => e[0]),
+            );
+        }
+
+        this._disposers.forEach(d => d());
+        this._disposers.length = 0;
+        this._map.clear();
+    }
+}
+
+export function combineDisposers(...items: DisposeFunction[]): DisposeFunction {
+    return () => items.forEach(i => i());
+}
+
+export class Disposable implements IDisposable {
+
+    protected readonly disposer = new Disposer();
+    protected _isDisposed = false;
+
+    public dispose = () => {
+        this._isDisposed = true;
+        this.disposer.dispose();
+    };
+}

package/src/fields/__tests__/fields.update.test.ts

@@ -0,0 +1,73 @@
+import { updateArray } from '../update';
+
+describe('fields/update', () => {
+    it('empty input', () => {
+        expect(updateArray(null, null)).toStrictEqual({ changed: 0, result: null });
+    });
+
+    it('updates primitives | numbers', () => {
+        const target = [1, 5, 3];
+        const source = [4, 3, 2];
+
+        const results1 = updateArray(target, source, { clone: true });
+        expect(results1.changed).toBe(4);
+        expect(results1.result).toStrictEqual([2, 3, 4]);
+
+        const results2 = updateArray(target, source, { sorter: null });
+        expect(results2.changed).toBe(4);
+        expect(results2.result).toStrictEqual([3, 4, 2]);
+    });
+
+    it('updates primitives | strings', () => {
+        const target = ['a', 'b', 'c'];
+        const source = ['b', 'c', 'd'];
+
+        const results = updateArray(target, source);
+
+        expect(results.changed).toBe(2);
+        expect(results.result).toStrictEqual(source);
+    });
+
+    describe('updates objects', () => {
+        it('no options', () => {
+            const res = updateArray([
+                { id: 1, v: 'a' },
+                { id: 5, v: 'e' },
+                { id: 3, v: 'c' },
+            ], [
+                { id: 2, v: 'b' },
+            ]);
+
+            expect(res.changed).toBe(4);
+            expect(res.result).toStrictEqual([
+                { id: 2, v: 'b' },
+            ]);
+        });
+
+        // eslint-disable-next-line jest/expect-expect
+        it('full options', () => {
+            const res = updateArray([
+                { id: 1, v: 'a' },
+                { id: 5, v: 'e' },
+                { id: 3, v: 'c' },
+            ], [
+                { id: 2, v: 'b' },
+                { id: 1, v: '1K' },
+            ], {
+                clone: true,
+                comparator: (v1, v2) => v1.id === v2.id,
+                updater: (t, s) => {
+                    t.v = s.v + '_' + t.id;
+                    return t;
+                },
+                sorter: (v1, v2) => v1.id - v2.id,
+            });
+
+            expect(res.changed).toBe(3);
+            expect(res.result).toStrictEqual([
+                { id: 1, v: '1K_1' },
+                { id: 2, v: 'b' },
+            ]);
+        });
+    });
+});

package/src/fields/update.ts

@@ -1,9 +1,14 @@
+import { Comparator } from '../types';
+
+export namespace Fields {
+    export type Getter<T> = (obj: Partial<T>) => T[keyof T];
+    export type Setter<T> = (obj: Partial<T>, val: T[keyof T]) => void;
+    export type Comparer<T> = (source: Partial<T>, target: Partial<T>) => boolean;
+    export type Updater<T> = (target: T, source: T) => T;
+}
 
-export type Getter<T> = (obj: Partial<T>) => T[keyof T];
-export type Setter<T> = (obj: Partial<T>, val: T[keyof T]) => void;
-export type Comparer<T> = (source: Partial<T>, target: Partial<T>) => boolean;
 
-export function updateField<T>(target: T, source: Partial<T>, diff: Partial<T>, key: keyof T, hasChanged: Comparer<T> = null): boolean {
+export function updateField<T>(target: T, source: Partial<T>, diff: Partial<T>, key: keyof T, hasChanged: Fields.Comparer<T> = null): boolean {
     return updateFieldExtended(target, source, diff, t => t[key], (t, v) => t[key] = v, hasChanged);
 }
 
@@ -11,9 +16,9 @@ export function updateFieldExtended<T>(
     target: T,
     source: Partial<T>,
     diff: Partial<T>,
-    get: Getter<T>,
-    set: Setter<T>,
-    hasChanged: Comparer<T> = null,
+    get: Fields.Getter<T>,
+    set: Fields.Setter<T>,
+    hasChanged: Fields.Comparer<T> = null,
 ): boolean {
 
     hasChanged = hasChanged || ((v1: T, v2: T) => (get(v1) !== get(v2)));
@@ -30,32 +35,61 @@ export function updateFieldExtended<T>(
 
 }
 
-export function updateArray<T extends string>(current: T[] | null, updated: T[]): { changed: number, result: T[] } {
-    if (!updated) {
-        return { changed: 0, result: current };
+const DefaultComparator: Comparator<any> = (v1, v2) => v1 === v2;
+const DefaultUpdater: Fields.Updater<any> = (v1, v2) => Object.assign(v1, v2);
+
+export type UpdateArrayOptions<T> = {
+    additive?: boolean,
+    clone?: boolean,
+    comparator?: Comparator<T>,
+    updater?: Fields.Updater<T>,
+    sorter?: Comparator<T, number> | null | undefined,
+};
+
+export function updateArray<T>(
+    target: T[] | null,
+    source: T[],
+    options?: UpdateArrayOptions<T>,
+): { changed: number, result: T[] } {
+    if (!source) {
+        return { changed: 0, result: target };
     }
 
     let changed = 0;
-    const result = current || [];
+    const result = Array.isArray(target)
+        ? (options?.clone ? target.slice() : target)
+        : [];
+
+    const comparator = options?.comparator || DefaultComparator;
+    const updater = options?.updater || DefaultUpdater;
 
     // remove all missing elements
-    for (let i = 0; i < result.length; ++i) {
-        if (!updated.includes(result[i])) {
-            result.splice(i, 1);
-            ++changed;
-            --i;
+    if (!options?.additive) {
+        for (let i = 0; i < result.length; ++i) {
+            if (source.find(item => comparator(item, result[i])) == null) {
+                result.splice(i, 1);
+                ++changed;
+                --i;
+            }
         }
     }
 
-    // add all new elements
-    updated.forEach(i => {
-        if (!result.includes(i)) {
+    // add all new elements and update existing
+    source.forEach(i => {
+        const existingIndex = result.findIndex(item => comparator(i, item));
+        const existingItem = result[existingIndex];
+        if (existingIndex < 0) {
             result.push(i);
             ++changed;
+        } else if (typeof existingItem === 'object') {
+            result[existingIndex] = updater(existingItem, i);
         }
     });
 
-    result.sort();
+    const sorter = options?.sorter;
+    if (sorter !== null) {
+        result.sort(sorter || undefined);
+    }
 
     return {
         result,

package/src/ident.ts

@@ -0,0 +1,8 @@
+
+export type Ident<T, K extends keyof any = string> = T & {
+    id: K;
+};
+
+export type IdentAny = Ident<{}>;
+
+export default Ident;

package/src/math/calc.ts

@@ -64,3 +64,6 @@ export function random(min: number = 0, max: number = 1, trunc = true) {
     return trunc ? Math.trunc(res) : res;
 }
 
+export function badRandomString(length = 12) {
+    return Math.random().toString(26).slice(2, clamp(length, 0, 12));
+}

package/src/transitionObserver.ts

@@ -1,7 +1,7 @@
 import { reaction } from 'mobx';
 import { IEvent, Event } from './event';
 import { ILogger, createLogger } from './logger';
-import { IDisposable } from './unsubscriber';
+import { IDisposable } from './disposer';
 
 export class TransitionObserver<T> implements IDisposable {
 

package/src/unsubscriber.ts

@@ -1,70 +1,11 @@
 import logger from './logger';
 
-export interface IDisposable {
-    dispose(): void;
-}
-
-export interface Disposer {
-    (): void;
-}
-
-export class Unsubscriber {
-
-    private readonly _disposers: Disposer[] = [];
-    private readonly _map = new Map<string, Disposer>();
-
-    constructor(readonly logName: string = null) { }
-
-    add(d: Disposer | IDisposable, id?: string) {
-        if (!d) {
-            return;
-        }
-
-        const dd: Disposer = typeof d !== 'function'
-            ? (() => d.dispose ? d.dispose() : null)
-            : d;
-
-        this._disposers.push(dd);
-
-        if (id) {
-            // dispose previous identified disposer
-            if (this._map.has(id)) {
-                this.execute(id);
-            }
-
-            this._map.set(id, dd);
-        }
-    }
-
-    execute(id: string) {
-        const d = this._map.get(id);
-        if (!d) {
-            return;
-        }
-
-        this._map.delete(id);
-        const i = this._disposers.indexOf(d);
-        if (i >= 0) {
-            this._disposers.splice(i, 1);
-        }
-
-        d();
-    }
-
-    dispose(log = false) {
-        if (log) {
-            logger.log(
-                `[Disposer:${this.logName || '<unknown>'}] Disposing ${this._disposers.length} items including named ones:`,
-                Array.from(this._map.entries()).map(e => e[0]),
-            );
-        }
-
-        this._disposers.forEach(d => d());
-        this._disposers.length = 0;
-        this._map.clear();
-    }
-}
-
-export function combineDisposers(...items: Disposer[]): Disposer {
-    return () => items.forEach(i => i());
-}
+export {
+    IDisposable,
+    DisposeFunction as Disposer,
+    combineDisposers,
+    Disposer as Unsubscriber,
+    Disposable,
+} from './disposer';
+
+logger.warn('@zajno/common: importing module "unsusbcriber" is deprecated; please change your import to "disposer" module.');