@zajno/common 1.3.6 → 1.3.10

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.6",
+  "version": "1.3.10",
   "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/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/types.ts

@@ -24,3 +24,7 @@ export type Comparator<T, C = boolean> = (v1: T, v2: T) => C;
 export namespace Comparator {
     export const Default: Comparator<any> = (a, b) => a === b;
 }
+
+export type TypedKeys<T extends Object, K> = {
+    [P in keyof T]: T[P] extends K ? P : never
+}[keyof T];

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.');

package/src/viewModels/FlagModel.ts

@@ -32,6 +32,20 @@ export class FlagModel implements IFlagModel, IFlagModelReadonly {
 
     get isDefault() { return this._value === false; }
 
+    @action
+    setTrue = () => {
+        const v = this.value;
+        this.value = true;
+        return !v;
+    };
+
+    @action
+    setFalse = () => {
+        const v = this.value;
+        this.value = false;
+        return v;
+    };
+
     @action
     toggle = () => {
         this._value = !this._value;