@zajno/common 1.4.4 → 1.4.5

package/lib/cache.d.ts

@@ -10,21 +10,25 @@ export declare class PromiseCache<T, K = string> {
     readonly fetcher: (id: K) => Promise<T>;
     readonly keyAdapter?: K extends string ? null : (k: K) => string;
     readonly keyParser?: K extends string ? null : (id: string) => K;
-    readonly observeItems: boolean;
     private readonly _itemsCache;
     private readonly _itemsStatus;
     private readonly _fetchCache;
     private _logger;
+    private _observeItems;
+    private readonly _busyCount;
     constructor(fetcher: (id: K) => Promise<T>, keyAdapter?: K extends string ? null : (k: K) => string, keyParser?: K extends string ? null : (id: string) => K, observeItems?: boolean);
+    get busyCount(): number;
+    useObserveItems(observeItems: boolean): this;
     private _pk;
     useLogger(name?: string): this;
     getDeferred(key: K): DeferredGetter<T>;
     getIsBusy(id: K): boolean;
-    getCurrent(id: K): T;
+    getCurrent(id: K, initiateFetch?: boolean): T;
     get(id: K): Promise<T>;
     private _doFetchAsync;
     invalidate(id: K): void;
     updateValueDirectly(id: K, value: T): void;
+    hasKey(id: K): boolean;
     keys(): string[];
     keysParsed(): K[];
     private _set;

package/lib/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAGA,oBAAY,cAAc,CAAC,CAAC,IAAI;IAC5B,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,yBAAiB,cAAc,CAAC;IAErB,MAAM,KAAK,sBAKO,CAAC;CAC7B;AAED,qBAAa,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM;IAa/B,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC;IACvC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM;IAChE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,CAAC,EAAE,EAAE,MAAM,KAAK,CAAC;IAChE,QAAQ,CAAC,YAAY;IAbzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;IAGtD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;IAE7D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAE/D,OAAO,CAAC,OAAO,CAAiB;gBAGnB,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAC9B,UAAU,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,EACvD,SAAS,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,CAAC,EAAE,EAAE,MAAM,KAAK,CAAC,EACvD,YAAY,UAAQ;IAKjC,OAAO,CAAC,GAAG;IAgBX,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM;IAKvB,WAAW,CAAC,GAAG,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;IAStC,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO;IAKzB,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC;IAQpB,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAqBtB,OAAO,CAAC,aAAa,CAiBnB;IAEF,UAAU,CAAC,EAAE,EAAE,CAAC;IAKhB,mBAAmB,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;IAKnC,IAAI;IAIJ,UAAU;IASV,OAAO,CAAC,IAAI;CAKf"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAIA,oBAAY,cAAc,CAAC,CAAC,IAAI;IAC5B,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,yBAAiB,cAAc,CAAC;IAErB,MAAM,KAAK,sBAKO,CAAC;CAC7B;AAED,qBAAa,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM;IAgB/B,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC;IACvC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM;IAChE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,CAAC,EAAE,EAAE,MAAM,KAAK,CAAC;IAfpE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;IAGtD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;IAE7D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAE/D,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsB;gBAGpC,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAC9B,UAAU,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,EACvD,SAAS,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,CAAC,EAAE,EAAE,MAAM,KAAK,CAAC,EAChE,YAAY,UAAQ;IAMxB,IAAW,SAAS,WAAoC;IAExD,eAAe,CAAC,YAAY,EAAE,OAAO;IAKrC,OAAO,CAAC,GAAG;IAgBX,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM;IAKvB,WAAW,CAAC,GAAG,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;IAStC,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO;IAKzB,UAAU,CAAC,EAAE,EAAE,CAAC,EAAE,aAAa,UAAO,GAAG,CAAC;IAU1C,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAqBtB,OAAO,CAAC,aAAa,CAmBnB;IAEF,UAAU,CAAC,EAAE,EAAE,CAAC;IAKhB,mBAAmB,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;IAKnC,MAAM,CAAC,EAAE,EAAE,CAAC;IAKZ,IAAI;IAIJ,UAAU;IASV,OAAO,CAAC,IAAI;CAKf"}

package/lib/cache.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PromiseCache = exports.DeferredGetter = void 0;
 const tslib_1 = require("tslib");
 const mobx_1 = require("mobx");
+const NumberModel_1 = require("./viewModels/NumberModel");
 const logger_1 = require("./logger");
 var DeferredGetter;
 (function (DeferredGetter) {
@@ -19,19 +20,21 @@ class PromiseCache {
         this.fetcher = fetcher;
         this.keyAdapter = keyAdapter;
         this.keyParser = keyParser;
-        this.observeItems = observeItems;
         this._itemsCache = {};
         this._itemsStatus = {};
         this._fetchCache = {};
         this._logger = null;
+        this._observeItems = false;
+        this._busyCount = new NumberModel_1.NumberModel(0);
         this._doFetchAsync = async (id, key) => {
             var _a;
             try {
+                this._busyCount.increment();
                 const res = await this.fetcher(id);
                 if (this._fetchCache[key]) {
                     (_a = this._logger) === null || _a === void 0 ? void 0 : _a.log(key, 'item\'s <promise> resolved to', res);
                     const result = res
-                        ? (this.observeItems ? mobx_1.observable.object(res) : res)
+                        ? (this._observeItems ? mobx_1.observable.object(res) : res)
                         : null;
                     mobx_1.runInAction(() => this._itemsCache[key] = result);
                 }
@@ -39,12 +42,19 @@ class PromiseCache {
             }
             finally {
                 mobx_1.runInAction(() => {
+                    this._busyCount.decrement();
                     delete this._fetchCache[key];
                     this._itemsStatus[key] = false;
                 });
             }
         };
         mobx_1.makeObservable(this);
+        this._observeItems = observeItems;
+    }
+    get busyCount() { return this._busyCount.value; }
+    useObserveItems(observeItems) {
+        this._observeItems = observeItems;
+        return this;
     }
     _pk(k) {
         if (k == null) {
@@ -74,11 +84,13 @@ class PromiseCache {
         const key = this._pk(id);
         return this._itemsStatus[key];
     }
-    getCurrent(id) {
+    getCurrent(id, initiateFetch = true) {
         var _a;
         const key = this._pk(id);
         const item = this._itemsCache[key];
-        this.get(id);
+        if (initiateFetch) {
+            this.get(id);
+        }
         (_a = this._logger) === null || _a === void 0 ? void 0 : _a.log(key, 'getCurrent returns', item);
         return item;
     }
@@ -108,6 +120,10 @@ class PromiseCache {
         const key = this._pk(id);
         this._set(key, value, undefined, undefined);
     }
+    hasKey(id) {
+        const key = this._pk(id);
+        return this._itemsCache[key] !== undefined || this._itemsStatus[key] !== undefined;
+    }
     keys() {
         return Object.keys(this._itemsCache);
     }

package/lib/cache.js.map

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

package/lib/observersMap.d.ts

@@ -0,0 +1,22 @@
+import { IDisposable } from './disposer';
+declare type Unsub = () => void;
+export declare class ObserversMap implements IDisposable {
+    readonly subscribe: null | ((key: string) => Promise<Unsub[]>);
+    readonly name?: string;
+    /** Unsusbcrobers map: key => unsub fn */
+    private readonly _map;
+    /** Timeouts map: key => timeout handle */
+    private readonly _timeouts;
+    private readonly _logger;
+    private readonly _count;
+    constructor(subscribe: null | ((key: string) => Promise<Unsub[]>), name?: string);
+    get count(): number;
+    getIsObserving(key: string): boolean;
+    getHasObserveTimeout(key: string): boolean;
+    enable(key: string, enable: boolean, clearAfter?: number, existingUnsubs?: Unsub[]): Promise<void>;
+    private refreshTimeout;
+    clear(): void;
+    dispose(): void;
+}
+export {};
+//# sourceMappingURL=observersMap.d.ts.map

package/lib/observersMap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"observersMap.d.ts","sourceRoot":"","sources":["../src/observersMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,WAAW,EAAE,MAAM,YAAY,CAAC;AAG3D,aAAK,KAAK,GAAG,MAAM,IAAI,CAAC;AAExB,qBAAa,YAAa,YAAW,WAAW;IAShC,QAAQ,CAAC,SAAS,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM;IARlG,yCAAyC;IACzC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiC;IACtD,0CAA0C;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0B;IAEpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;gBAEvB,SAAS,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAW,IAAI,CAAC,EAAE,MAAM;IAIlG,IAAW,KAAK,WAAgC;IAEzC,cAAc,CAAC,GAAG,EAAE,MAAM;IAI1B,oBAAoB,CAAC,GAAG,EAAE,MAAM;IAI1B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAE,MAAa,EAAE,cAAc,GAAE,KAAK,EAAS;IAuC3G,OAAO,CAAC,cAAc;IAkBf,KAAK;IAeL,OAAO;CAGjB"}

package/lib/{observers.js → observersMap.js}

@@ -1,21 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Observers = void 0;
+exports.ObserversMap = void 0;
 const logger_1 = require("./logger");
 const disposer_1 = require("./disposer");
-class Observers {
+const NumberModel_1 = require("./viewModels/NumberModel");
+class ObserversMap {
     constructor(subscribe, name) {
         this.subscribe = subscribe;
         this.name = name;
+        /** Unsusbcrobers map: key => unsub fn */
         this._map = new Map();
+        /** Timeouts map: key => timeout handle */
         this._timeouts = new Map();
         this._logger = null;
+        this._count = new NumberModel_1.NumberModel();
         this._logger = logger_1.createLogger(`[Observers:${this.name || '?'}]`);
     }
+    get count() { return this._count.value; }
     getIsObserving(key) {
         return this._map.has(key);
     }
-    async enable(key, enable, clearAfter = null) {
+    getHasObserveTimeout(key) {
+        return this.getIsObserving(key) && this._timeouts.has(key);
+    }
+    async enable(key, enable, clearAfter = null, existingUnsubs = null) {
         if (enable === this.getIsObserving(key)) {
             this.refreshTimeout(key, enable, clearAfter, true);
             return;
@@ -26,13 +34,17 @@ class Observers {
             let disabed = false;
             const marker = () => { disabed = true; };
             this._map.set(key, marker);
-            const unsubs = await this.subscribe(key);
+            if (!this.subscribe && !existingUnsubs) {
+                throw new Error('Neither subscribe function nor existingUnsubs has been configured');
+            }
+            const unsubs = existingUnsubs || await this.subscribe(key);
             const result = disposer_1.combineDisposers(...unsubs);
             if (disabed) { // unsubscribe was requested
                 result();
             }
             else {
                 this._map.set(key, result);
+                this._count.increment();
                 this.refreshTimeout(key, true, clearAfter);
             }
         }
@@ -42,6 +54,7 @@ class Observers {
             const unsub = this._map.get(key);
             this._map.delete(key);
             unsub();
+            this._count.decrement();
         }
     }
     refreshTimeout(key, enable, timeout, refresh = false) {
@@ -59,16 +72,22 @@ class Observers {
             this._timeouts.set(key, t);
         }
     }
-    dispose() {
-        for (const u of this._map.values()) {
-            u();
-        }
-        this._map.clear();
+    clear() {
+        // Clear timeouts
         for (const t of this._timeouts.values()) {
             clearTimeout(t);
         }
         this._timeouts.clear();
+        // Invoke unsubscribers
+        for (const u of this._map.values()) {
+            u();
+        }
+        this._map.clear();
+        this._count.setValue(0);
+    }
+    dispose() {
+        this.clear();
     }
 }
-exports.Observers = Observers;
-//# sourceMappingURL=observers.js.map
+exports.ObserversMap = ObserversMap;
+//# sourceMappingURL=observersMap.js.map

package/lib/observersMap.js.map

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

package/lib/observingCache.d.ts

@@ -0,0 +1,29 @@
+import { Disposable } from './disposer';
+import { DeferredGetter } from './cache';
+import { Fields } from './fields';
+export declare type Unsub = () => void;
+export declare type Fetcher<T> = (key: string, cb: (val: T) => Promise<void> | void) => Unsub | Promise<Unsub>;
+declare type ObserveStrategy = boolean | 'short' | number;
+export interface IObservingCache<T> {
+    get(key: string): DeferredGetter<T>;
+}
+export declare class ObservingCache<T> extends Disposable implements IObservingCache<T> {
+    readonly fetcher: Fetcher<T>;
+    private readonly _cache;
+    private readonly _observers;
+    private _observeStrategy;
+    private readonly _observeStrategyOverrides;
+    private _updater;
+    constructor(fetcher: Fetcher<T>);
+    get loadingCount(): number;
+    get observersCount(): number;
+    useObservingStrategy(observe: ObserveStrategy): this;
+    useUpdater(updater: Fields.Updater<T>): this;
+    get(key: string, overrideStrategy?: ObserveStrategy): DeferredGetter<T>;
+    populate: (key: string, item: T) => void;
+    private _fetch;
+    private _subscribe;
+    private _updateItem;
+}
+export {};
+//# sourceMappingURL=observingCache.d.ts.map

package/lib/observingCache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"observingCache.d.ts","sourceRoot":"","sources":["../src/observingCache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAgB,cAAc,EAAE,MAAM,SAAS,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,oBAAY,KAAK,GAAG,MAAM,IAAI,CAAC;AAC/B,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAEvG,aAAK,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAElD,MAAM,WAAW,eAAe,CAAC,CAAC;IAC9B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;CACvC;AAED,qBAAa,cAAc,CAAC,CAAC,CAAE,SAAQ,UAAW,YAAW,eAAe,CAAC,CAAC,CAAC;IAU/D,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IARxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAE1C,OAAO,CAAC,gBAAgB,CAAyB;IACjD,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAwC;IAElF,OAAO,CAAC,QAAQ,CAA2B;gBAEtB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IASxC,IAAW,YAAY,WAAoC;IAC3D,IAAW,cAAc,WAAoC;IAE7D,oBAAoB,CAAC,OAAO,EAAE,eAAe;IAa7C,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAMrC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC;IAgBvE,QAAQ,QAAS,MAAM,QAAQ,CAAC,UAE9B;IAEF,OAAO,CAAC,MAAM,CAwBZ;IAEF,OAAO,CAAC,UAAU,CAIhB;IAEF,OAAO,CAAC,WAAW,CAYhB;CACN"}

package/lib/observingCache.js

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ObservingCache = void 0;
+const mobx_1 = require("mobx");
+const disposer_1 = require("./disposer");
+const cache_1 = require("./cache");
+const observersMap_1 = require("./observersMap");
+class ObservingCache extends disposer_1.Disposable {
+    constructor(fetcher) {
+        super();
+        this.fetcher = fetcher;
+        this._observeStrategy = null;
+        this._observeStrategyOverrides = {};
+        this._updater = null;
+        this.populate = (key, item) => {
+            this._updateItem(key, item);
+        };
+        this._fetch = async (key) => {
+            let firstLoad = true;
+            return new Promise((resolve) => {
+                Promise.resolve(this.fetcher(key, item => {
+                    if (firstLoad) {
+                        resolve(item);
+                        firstLoad = false;
+                    }
+                    else {
+                        this._updateItem(key, item);
+                    }
+                })).then(unsub => {
+                    const strategy = this._observeStrategyOverrides[key] || this._observeStrategy;
+                    if (!strategy) {
+                        // immediate unsub in case no observing strategy has been set
+                        unsub();
+                    }
+                    else {
+                        const timeout = getObserveTimeout(strategy);
+                        this._observers.enable(key, true, timeout, [unsub]);
+                    }
+                });
+            });
+        };
+        this._subscribe = (key) => {
+            return Promise.all([
+                this.fetcher(key, item => this._updateItem(key, item)),
+            ]);
+        };
+        this._updateItem = mobx_1.action((key, item) => {
+            if (this._updater != null) {
+                const current = this._cache.getCurrent(key, false);
+                if (current != null) {
+                    const result = this._updater(current, item);
+                    // re-set existing item but with updated contents
+                    this._cache.updateValueDirectly(key, result);
+                    return;
+                }
+            }
+            this._cache.updateValueDirectly(key, item);
+        });
+        this._cache = new cache_1.PromiseCache(this._fetch);
+        this._observers = new observersMap_1.ObserversMap(this._subscribe);
+        this.disposer.add(this._observers);
+    }
+    get loadingCount() { return this._cache.busyCount; }
+    get observersCount() { return this._observers.count; }
+    useObservingStrategy(observe) {
+        this._observeStrategy = observe;
+        if (!this._observeStrategy) {
+            this._observers.clear();
+        }
+        else {
+            const currentKeys = this._cache.keys();
+            const timeout = getObserveTimeout(this._observeStrategy);
+            currentKeys.forEach(key => this._observers.enable(key, true, timeout));
+        }
+        return this;
+    }
+    useUpdater(updater) {
+        this._updater = updater;
+        this._cache.useObserveItems(updater != null);
+        return this;
+    }
+    get(key, overrideStrategy) {
+        this._observeStrategyOverrides[key] = overrideStrategy;
+        const strategy = overrideStrategy || this._observeStrategy;
+        if (strategy && !this._observers.getIsObserving(key)) {
+            // ensure observe
+            if (this._cache.hasKey(key)) {
+                // the request has been initiated already
+                const timeout = getObserveTimeout(strategy);
+                this._observers.enable(key, true, timeout);
+            }
+        }
+        return this._cache.getDeferred(key);
+    }
+}
+exports.ObservingCache = ObservingCache;
+function getObserveTimeout(s) {
+    if (!s) {
+        return undefined;
+    }
+    return typeof s === 'number'
+        ? s
+        : (s === 'short'
+            ? 5 * 60 * 1000
+            : null);
+}
+//# sourceMappingURL=observingCache.js.map

package/lib/observingCache.js.map

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

package/package.json

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

package/src/__tests__/observingCache.test.ts

@@ -0,0 +1,127 @@
+import { observable, reaction, runInAction, toJS } from 'mobx';
+import { ObservingCache } from '../observingCache';
+import { setTimeoutAsync } from '../async/timeout';
+
+type TestItem = {
+    hello: string,
+};
+
+function createData() {
+    const Database: Record<string, TestItem> = observable({
+        '123': { hello: 'Hi, 123' },
+    });
+
+    const Repository = {
+        fetch: (key: string, cb: (value: TestItem) => void) => {
+            return reaction(() => Database[key], async item => {
+                await setTimeoutAsync(100);
+                cb(item);
+            }, { fireImmediately: true, delay: 100 });
+        },
+    };
+
+    const subscribeFn = jest.fn().mockImplementation(null);
+    const unsubFn = jest.fn().mockImplementation(null);
+
+    const Cache = new ObservingCache((key, cb) => {
+        subscribeFn(key);
+        const unsub = Repository.fetch(key, cb);
+        return () => {
+            unsubFn();
+            unsub();
+        };
+    });
+
+    return {
+        Database,
+        Repository,
+        Cache,
+        subscribeFn,
+        unsubFn,
+    };
+}
+
+
+describe('ObservingCache works with', () => {
+    it('no observing', async () => {
+        const { Database, Cache, subscribeFn, unsubFn } = createData();
+        try {
+            expect(Cache).not.toBeNull();
+            expect(subscribeFn).not.toHaveBeenCalled();
+            expect(unsubFn).not.toHaveBeenCalled();
+
+            const KEY = '123';
+
+            const deferred = Cache.get(KEY);
+
+            expect(deferred.busy).toBeUndefined();
+            expect(deferred.current).toBeUndefined();
+            expect(deferred.busy).toBeTruthy();
+
+            const expectedItem = toJS(Database[KEY]);
+
+            await expect(deferred.promise).resolves.toStrictEqual(expectedItem);
+
+            expect(deferred.current).toStrictEqual(expectedItem);
+            expect(deferred.busy).toBeFalsy();
+
+            expect(unsubFn).toHaveBeenCalledTimes(1);
+
+            expect(subscribeFn).toHaveBeenCalledTimes(1);
+            expect(subscribeFn).toHaveBeenCalledWith(KEY);
+
+            subscribeFn.mockClear();
+            unsubFn.mockClear();
+
+            Database[KEY] = { hello: 'bye' };
+
+            expect(subscribeFn).not.toHaveBeenCalled();
+        } finally {
+            Cache.dispose();
+        }
+    });
+
+    it('infinite observing', async () => {
+        const { Database, Cache, subscribeFn, unsubFn } = createData();
+        try {
+            Cache.useObservingStrategy(true);
+
+            const KEY = '123';
+
+            const deferred = Cache.get(KEY);
+
+            expect(deferred.busy).toBeUndefined();
+            expect(deferred.current).toBeUndefined();
+            expect(deferred.busy).toBeTruthy();
+
+            const expectedItem = toJS(Database[KEY]);
+
+            await expect(deferred.promise).resolves.toStrictEqual(expectedItem);
+
+            expect(deferred.current).toStrictEqual(expectedItem);
+            expect(deferred.busy).toBeFalsy();
+
+            expect(unsubFn).not.toHaveBeenCalled();
+
+            expect(subscribeFn).toHaveBeenCalledTimes(1);
+            expect(subscribeFn).toHaveBeenCalledWith(KEY);
+
+            subscribeFn.mockClear();
+            unsubFn.mockClear();
+
+            const replaceItem: TestItem = { hello: 'bye' };
+            runInAction(() => {
+                Database[KEY] = replaceItem;
+            });
+
+            expect(subscribeFn).not.toHaveBeenCalled();
+
+            await setTimeoutAsync(300);
+
+            expect(deferred.current).toStrictEqual(replaceItem);
+        } finally {
+            Cache.dispose();
+            expect(unsubFn).toHaveBeenCalledTimes(1);
+        }
+    });
+});

package/src/cache.ts

@@ -1,4 +1,5 @@
 import { observable, makeObservable, runInAction, action } from 'mobx';
+import { NumberModel } from './viewModels/NumberModel';
 import { createLogger, ILogger } from './logger';
 
 export type DeferredGetter<T> = {
@@ -28,14 +29,25 @@ export class PromiseCache<T, K = string> {
     private readonly _fetchCache: Record<string, Promise<T>> = { };
 
     private _logger: ILogger = null;
+    private _observeItems = false;
+
+    private readonly _busyCount = new NumberModel(0);
 
     constructor(
         readonly fetcher: (id: K) => Promise<T>,
         readonly keyAdapter?: K extends string ? null : (k: K) => string,
         readonly keyParser?: K extends string ? null : (id: string) => K,
-        readonly observeItems = false,
+        observeItems = false,
     ) {
         makeObservable(this);
+        this._observeItems = observeItems;
+    }
+
+    public get busyCount() { return this._busyCount.value; }
+
+    useObserveItems(observeItems: boolean) {
+        this._observeItems = observeItems;
+        return this;
     }
 
     private _pk(k: K): string {
@@ -73,10 +85,12 @@ export class PromiseCache<T, K = string> {
         return this._itemsStatus[key];
     }
 
-    getCurrent(id: K): T {
+    getCurrent(id: K, initiateFetch = true): T {
         const key = this._pk(id);
         const item = this._itemsCache[key];
-        this.get(id);
+        if (initiateFetch) {
+            this.get(id);
+        }
         this._logger?.log(key, 'getCurrent returns', item);
         return item;
     }
@@ -104,17 +118,19 @@ export class PromiseCache<T, K = string> {
 
     private _doFetchAsync = async (id: K, key: string) => {
         try {
+            this._busyCount.increment();
             const res = await this.fetcher(id);
             if (this._fetchCache[key]) {
                 this._logger?.log(key, 'item\'s <promise> resolved to', res);
                 const result = res
-                    ? (this.observeItems ? observable.object(res) : res)
+                    ? (this._observeItems ? observable.object(res) : res)
                     : null;
                 runInAction(() => this._itemsCache[key] = result);
             }
             return res;
         } finally {
             runInAction(() => {
+                this._busyCount.decrement();
                 delete this._fetchCache[key];
                 this._itemsStatus[key] = false;
             });
@@ -131,6 +147,11 @@ export class PromiseCache<T, K = string> {
         this._set(key, value, undefined, undefined);
     }
 
+    hasKey(id: K) {
+        const key = this._pk(id);
+        return this._itemsCache[key] !== undefined || this._itemsStatus[key] !== undefined;
+    }
+
     keys() {
         return Object.keys(this._itemsCache);
     }