@zajno/common 1.4.5 → 1.4.6

package/coverage/lcov-report/src/viewModels/Validatable.ts.html

@@ -361,7 +361,7 @@ export abstract class ValidatableModel<T = string> {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Wed Feb 09 2022 23:09:57 GMT+0000 (Coordinated Universal Time)
+                at Sun Feb 13 2022 23:33:48 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/src/viewModels/index.html

@@ -170,7 +170,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Wed Feb 09 2022 23:09:57 GMT+0000 (Coordinated Universal Time)
+                at Sun Feb 13 2022 23:33:48 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/src/viewModels/wrappers.ts.html

@@ -211,7 +211,7 @@ export function mixinLabel<T, TModel extends IValueModel<T>, TLabel = s
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Wed Feb 09 2022 23:09:57 GMT+0000 (Coordinated Universal Time)
+                at Sun Feb 13 2022 23:33:48 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov.info

@@ -663,23 +663,27 @@ end_of_record
 TN:
 SF:src/observingCache.ts
 FN:26,(anonymous_0)
-FN:73,(anonymous_1)
-FN:77,(anonymous_2)
-FN:80,(anonymous_3)
-FN:82,(anonymous_4)
-FN:90,(anonymous_5)
-FN:103,(anonymous_6)
-FN:105,(anonymous_7)
-FN:109,(anonymous_8)
+FN:84,(anonymous_1)
+FN:88,(anonymous_2)
+FN:91,(anonymous_3)
+FN:93,(anonymous_4)
+FN:101,(anonymous_5)
+FN:114,(anonymous_6)
+FN:116,(anonymous_7)
+FN:120,(anonymous_8)
 FN:35,(anonymous_9)
 FN:36,(anonymous_10)
 FN:38,(anonymous_11)
 FN:45,(anonymous_12)
 FN:51,(anonymous_13)
 FN:57,(anonymous_14)
-FN:124,getObserveTimeout
-FNF:16
-FNH:9
+FN:61,(anonymous_15)
+FN:65,(anonymous_16)
+FN:135,getObserveTimeout
+FN:148,firstDefined
+FN:149,(anonymous_19)
+FNF:20
+FNH:11
 FNDA:2,(anonymous_0)
 FNDA:0,(anonymous_1)
 FNDA:2,(anonymous_2)
@@ -694,8 +698,12 @@ FNDA:0,(anonymous_10)
 FNDA:1,(anonymous_11)
 FNDA:0,(anonymous_12)
 FNDA:0,(anonymous_13)
-FNDA:2,(anonymous_14)
+FNDA:0,(anonymous_14)
+FNDA:0,(anonymous_15)
+FNDA:2,(anonymous_16)
 FNDA:2,getObserveTimeout
+FNDA:4,firstDefined
+FNDA:8,(anonymous_19)
 DA:1,1
 DA:2,1
 DA:3,1
@@ -721,72 +729,74 @@ DA:48,1
 DA:52,0
 DA:53,0
 DA:54,0
-DA:58,2
-DA:60,2
-DA:61,2
-DA:63,1
-DA:65,0
-DA:66,0
+DA:58,0
+DA:62,0
+DA:66,2
+DA:67,0
 DA:70,2
-DA:73,2
-DA:74,0
-DA:77,2
-DA:78,2
-DA:80,2
+DA:72,2
+DA:74,1
+DA:76,0
+DA:77,0
 DA:81,2
-DA:83,3
 DA:84,2
-DA:85,2
-DA:87,1
+DA:85,0
+DA:88,2
+DA:89,2
 DA:91,2
 DA:92,2
-DA:94,1
-DA:96,1
-DA:97,1
+DA:94,3
+DA:95,2
+DA:96,2
+DA:98,1
+DA:102,2
 DA:103,2
-DA:104,0
-DA:105,0
-DA:109,2
-DA:110,1
-DA:111,0
-DA:112,0
-DA:113,0
+DA:105,1
+DA:107,1
+DA:108,1
+DA:114,2
 DA:115,0
 DA:116,0
-DA:120,1
-DA:125,2
+DA:120,2
+DA:121,1
+DA:122,0
+DA:123,0
+DA:124,0
 DA:126,0
-DA:129,2
-LF:61
-LH:44
-BRDA:83,0,0,2
-BRDA:83,0,1,1
-BRDA:91,1,0,2
-BRDA:91,1,1,2
-BRDA:92,2,0,1
-BRDA:92,2,1,1
-BRDA:110,3,0,0
-BRDA:110,3,1,1
-BRDA:112,4,0,0
-BRDA:112,4,1,0
-BRDA:40,5,0,0
-BRDA:40,5,1,1
-BRDA:60,6,0,2
-BRDA:60,6,1,2
-BRDA:61,7,0,1
-BRDA:61,7,1,1
-BRDA:61,8,0,2
-BRDA:61,8,1,1
-BRDA:63,9,0,0
-BRDA:63,9,1,1
-BRDA:125,10,0,0
-BRDA:125,10,1,2
-BRDA:130,11,0,0
-BRDA:130,11,1,2
-BRDA:132,12,0,0
-BRDA:132,12,1,2
-BRF:26
-BRH:18
+DA:127,0
+DA:131,1
+DA:136,2
+DA:137,0
+DA:140,2
+DA:149,8
+LF:65
+LH:45
+BRDA:94,0,0,2
+BRDA:94,0,1,1
+BRDA:103,1,0,1
+BRDA:103,1,1,1
+BRDA:121,2,0,0
+BRDA:121,2,1,1
+BRDA:123,3,0,0
+BRDA:123,3,1,0
+BRDA:40,4,0,0
+BRDA:40,4,1,1
+BRDA:66,5,0,0
+BRDA:66,5,1,2
+BRDA:72,6,0,1
+BRDA:72,6,1,1
+BRDA:72,7,0,2
+BRDA:72,7,1,1
+BRDA:74,8,0,0
+BRDA:74,8,1,1
+BRDA:136,9,0,0
+BRDA:136,9,1,2
+BRDA:141,10,0,0
+BRDA:141,10,1,2
+BRDA:143,11,0,0
+BRDA:143,11,1,2
+BRF:24
+BRH:15
 end_of_record
 TN:
 SF:src/transitionObserver.ts

package/lib/observingCache.d.ts

@@ -19,6 +19,8 @@ export declare class ObservingCache<T> extends Disposable implements IObservingC
     get observersCount(): number;
     useObservingStrategy(observe: ObserveStrategy): this;
     useUpdater(updater: Fields.Updater<T>): this;
+    getIsCached(key: string): boolean;
+    getCurent(key: string): T;
     get(key: string, overrideStrategy?: ObserveStrategy): DeferredGetter<T>;
     populate: (key: string, item: T) => void;
     private _fetch;

package/lib/observingCache.d.ts.map

@@ -1 +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"}
+{"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,WAAW,CAAC,GAAG,EAAE,MAAM;IAIvB,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC;IAmBvE,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

@@ -27,7 +27,7 @@ class ObservingCache extends disposer_1.Disposable {
                         this._updateItem(key, item);
                     }
                 })).then(unsub => {
-                    const strategy = this._observeStrategyOverrides[key] || this._observeStrategy;
+                    const strategy = firstDefined(this._observeStrategyOverrides[key], this._observeStrategy);
                     if (!strategy) {
                         // immediate unsub in case no observing strategy has been set
                         unsub();
@@ -79,9 +79,17 @@ class ObservingCache extends disposer_1.Disposable {
         this._cache.useObserveItems(updater != null);
         return this;
     }
+    getIsCached(key) {
+        return this._cache.hasKey(key);
+    }
+    getCurent(key) {
+        return this._cache.getCurrent(key, false);
+    }
     get(key, overrideStrategy) {
-        this._observeStrategyOverrides[key] = overrideStrategy;
-        const strategy = overrideStrategy || this._observeStrategy;
+        if (overrideStrategy !== undefined) {
+            this._observeStrategyOverrides[key] = overrideStrategy;
+        }
+        const strategy = firstDefined(this._observeStrategyOverrides[key], this._observeStrategy);
         if (strategy && !this._observers.getIsObserving(key)) {
             // ensure observe
             if (this._cache.hasKey(key)) {
@@ -104,4 +112,7 @@ function getObserveTimeout(s) {
             ? 5 * 60 * 1000
             : null);
 }
+function firstDefined(...values) {
+    return values.find(v => v !== undefined);
+}
 //# sourceMappingURL=observingCache.js.map

package/lib/observingCache.js.map

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

package/lib/viewModels/InitializableModel.d.ts

@@ -0,0 +1,6 @@
+export declare class InitializableModel {
+    private readonly _counter;
+    get initializing(): boolean;
+    protected runOperation<T>(operation: () => Promise<T> | T): Promise<T>;
+}
+//# sourceMappingURL=InitializableModel.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InitializableModel.d.ts","sourceRoot":"","sources":["../../src/viewModels/InitializableModel.ts"],"names":[],"mappings":"AAEA,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAE/C,IAAW,YAAY,YAAsC;cAE7C,YAAY,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAS/E"}

package/lib/viewModels/InitializableModel.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InitializableModel = void 0;
+const tslib_1 = require("tslib");
+const NumberModel_1 = tslib_1.__importDefault(require("./NumberModel"));
+class InitializableModel {
+    constructor() {
+        this._counter = new NumberModel_1.default(0);
+    }
+    get initializing() { return this._counter.value > 0; }
+    async runOperation(operation) {
+        try {
+            this._counter.increment();
+            const res = await operation();
+            return res;
+        }
+        finally {
+            this._counter.decrement();
+        }
+    }
+}
+exports.InitializableModel = InitializableModel;
+//# sourceMappingURL=InitializableModel.js.map

package/lib/viewModels/InitializableModel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InitializableModel.js","sourceRoot":"","sources":["../../src/viewModels/InitializableModel.ts"],"names":[],"mappings":";;;;AAAA,wEAAwC;AAExC,MAAa,kBAAkB;IAA/B;QACqB,aAAQ,GAAG,IAAI,qBAAW,CAAC,CAAC,CAAC,CAAC;IAanD,CAAC;IAXG,IAAW,YAAY,KAAK,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAEnD,KAAK,CAAC,YAAY,CAAI,SAA+B;QAC3D,IAAI;YACA,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YAC1B,MAAM,GAAG,GAAG,MAAM,SAAS,EAAE,CAAC;YAC9B,OAAO,GAAG,CAAC;SACd;gBAAS;YACN,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;SAC7B;IACL,CAAC;CACJ;AAdD,gDAcC"}

package/package.json

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

package/src/observingCache.ts

@@ -54,10 +54,21 @@ export class ObservingCache<T> extends Disposable implements IObservingCache<T>
         return this;
     }
 
+    getIsCached(key: string) {
+        return this._cache.hasKey(key);
+    }
+
+    getCurent(key: string) {
+        return this._cache.getCurrent(key, false);
+    }
+
     get(key: string, overrideStrategy?: ObserveStrategy): DeferredGetter<T> {
-        this._observeStrategyOverrides[key] = overrideStrategy;
+        if (overrideStrategy !== undefined) {
+            this._observeStrategyOverrides[key] = overrideStrategy;
+        }
+
+        const strategy = firstDefined(this._observeStrategyOverrides[key], this._observeStrategy);
 
-        const strategy = overrideStrategy || this._observeStrategy;
         if (strategy && !this._observers.getIsObserving(key)) {
             // ensure observe
             if (this._cache.hasKey(key)) {
@@ -88,7 +99,7 @@ export class ObservingCache<T> extends Disposable implements IObservingCache<T>
                     }
                 })
             ).then(unsub => {
-                const strategy = this._observeStrategyOverrides[key] || this._observeStrategy;
+                const strategy = firstDefined(this._observeStrategyOverrides[key], this._observeStrategy);
                 if (!strategy) {
                     // immediate unsub in case no observing strategy has been set
                     unsub();
@@ -133,3 +144,7 @@ function getObserveTimeout(s: ObserveStrategy) {
             : null
         );
 }
+
+function firstDefined<T>(...values: (T | undefined)[]) {
+    return values.find(v => v !== undefined);
+}

package/src/viewModels/InitializableModel.ts

@@ -0,0 +1,17 @@
+import NumberModel from './NumberModel';
+
+export class InitializableModel {
+    private readonly _counter = new NumberModel(0);
+
+    public get initializing() { return this._counter.value > 0; }
+
+    protected async runOperation<T>(operation: () => Promise<T> | T): Promise<T> {
+        try {
+            this._counter.increment();
+            const res = await operation();
+            return res;
+        } finally {
+            this._counter.decrement();
+        }
+    }
+}