@zajno/common 1.4.14 → 1.4.17

package/lib/viewModels/LoadingModel.js

@@ -4,9 +4,15 @@ exports.LoadingModel = void 0;
 const NumberModel_1 = require("./NumberModel");
 class LoadingModel extends NumberModel_1.NumberModel {
     get isLoading() { return this.value > 0; }
-    async useLoading(cb) {
+    async useLoading(cb, exclusive = false) {
+        if (exclusive && this.isLoading) {
+            if (exclusive === 'throw') {
+                throw new Error('Operation cannot be started because another one is in progress already.');
+            }
+            return false;
+        }
+        this.increment();
         try {
-            this.increment();
             const res = await cb();
             return res;
         }

package/lib/viewModels/LoadingModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"LoadingModel.js","sourceRoot":"","sources":["../../src/viewModels/LoadingModel.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,MAAa,YAAa,SAAQ,yBAAW;IAEzC,IAAW,SAAS,KAAK,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAE1C,KAAK,CAAC,UAAU,CAAI,EAA0B;QACjD,IAAI;YACA,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;YACvB,OAAO,GAAG,CAAC;SACd;gBAAS;YACN,IAAI,CAAC,SAAS,EAAE,CAAC;SACpB;IACL,CAAC;CACJ;AAbD,oCAaC"}
+{"version":3,"file":"LoadingModel.js","sourceRoot":"","sources":["../../src/viewModels/LoadingModel.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,MAAa,YAAa,SAAQ,yBAAW;IAEzC,IAAW,SAAS,KAAK,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAM1C,KAAK,CAAC,UAAU,CAAI,EAA0B,EAAE,YAA+B,KAAK;QACvF,IAAI,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE;YAC7B,IAAI,SAAS,KAAK,OAAO,EAAE;gBACvB,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAC;aAC9F;YACD,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,CAAC,SAAS,EAAE,CAAC;QAEjB,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;YACvB,OAAO,GAAG,CAAC;SACd;gBAAS;YACN,IAAI,CAAC,SAAS,EAAE,CAAC;SACpB;IACL,CAAC;CACJ;AAzBD,oCAyBC"}

package/package.json

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

package/src/__tests__/tempoCache.test.ts

@@ -0,0 +1,31 @@
+import { TempoCache } from '../tempoCache';
+import { setTimeoutAsync } from '../async/timeout';
+
+describe('TempoCache', () => {
+    it('just works', async () => {
+        let incrementer = 1;
+
+        const example = new TempoCache(() => Promise.resolve(incrementer++), 199);
+
+        expect(await example.current).toBe(1);
+        await expect(example.current).resolves.toBe(1);
+
+        await setTimeoutAsync(100);
+
+        await expect(example.current).resolves.toBe(1);
+
+        await setTimeoutAsync(200);
+
+        await expect(example.current).resolves.toBe(2);
+
+        await setTimeoutAsync(100);
+
+        await expect(example.current).resolves.toBe(2);
+        await expect(example.current).resolves.toBe(2);
+
+        await setTimeoutAsync(300);
+
+        await expect(example.current).resolves.toBe(3);
+        await expect(example.current).resolves.toBe(3);
+    });
+});

package/src/tempoCache.ts

@@ -0,0 +1,18 @@
+
+export class TempoCache<T> {
+
+    private _expiringAt: number = 0; // already expired
+    private _current: T = undefined;
+
+    constructor(readonly factory: () => T, readonly lifetimeMs: number) { }
+
+    public get isExpired() { return Date.now() >= this._expiringAt; }
+
+    public get current() {
+        if (this.isExpired) {
+            this._current = this.factory();
+            this._expiringAt = Date.now() + this.lifetimeMs;
+        }
+        return this._current;
+    }
+}

package/src/timeHelper.ts

@@ -1,4 +1,6 @@
-import { observable, makeObservable } from 'mobx';
+
+// eslint-disable-next-line no-console
+console.warn('"timeHelper" module is deprecated. Please use "dates" one.');
 
 /** @deprecated */
 export function formatMS(ms: number): string {
@@ -35,20 +37,3 @@ export function secToFormattedMin(totalSec: number): string {
 
     return res;
 }
-
-class Time {
-    @observable
-    private _now: number = new Date().getTime();
-
-    constructor() {
-        makeObservable(this);
-        // Update _now once an hour
-        setInterval(() => { this._now = new Date().getTime(); }, 1000 * 3600);
-    }
-
-    get now() {
-        return this._now;
-    }
-}
-
-export const TimeHelper = new Time();

package/src/timer.ts

@@ -0,0 +1,40 @@
+import { IDisposable } from './disposer';
+import { Event, EventHandler, IEvent } from './event';
+
+export class Timer implements IDisposable, IEvent<number> {
+    private readonly _event = new Event<number>();
+
+    private _now: number = Date.now();
+    private _handle = null;
+
+    constructor(readonly interval = 3600 * 1000) {
+        this.restart();
+    }
+
+    get now() {
+        return this._now;
+    }
+
+    on(handler: EventHandler<number>): () => void {
+        return this._event.on(handler);
+    }
+
+    off(handler: EventHandler<number>): void {
+        return this._event.off(handler);
+    }
+
+    public restart() {
+        this.dispose();
+
+        // Update _now once an hour
+        this._handle = setInterval(() => {
+            this._now = Date.now();
+            this._event.trigger(this._now);
+        }, this.interval);
+    }
+
+    public dispose(): void {
+        clearInterval(this._handle);
+        this._handle = null;
+    }
+}

package/src/viewModels/LoadingModel.ts

@@ -4,9 +4,21 @@ export class LoadingModel extends NumberModel {
 
     public get isLoading() { return this.value > 0; }
 
-    public async useLoading<T>(cb: () => (T | Promise<T>)): Promise<T> {
+    public async useLoading<T>(cb: () => (T | Promise<T>)): Promise<T>;
+    public async useLoading<T>(cb: () => (T | Promise<T>), exclusive: false): Promise<T>;
+    public async useLoading<T>(cb: () => (T | Promise<T>), exclusive: true | 'throw'): Promise<T | false>;
+
+    public async useLoading<T>(cb: () => (T | Promise<T>), exclusive: boolean | 'throw' = false): Promise<T | false> {
+        if (exclusive && this.isLoading) {
+            if (exclusive === 'throw') {
+                throw new Error('Operation cannot be started because another one is in progress already.');
+            }
+            return false;
+        }
+
+        this.increment();
+
         try {
-            this.increment();
             const res = await cb();
             return res;
         } finally {

package/yarn.lock

@@ -2752,9 +2752,9 @@ minimatch@^3.0.4:
     brace-expansion "^1.1.7"
 
 minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 mkdirp@^0.5.3:
   version "0.5.5"