@zajno/common 1.6.0 → 1.6.1

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

@@ -376,7 +376,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" rel="noopener noreferrer">istanbul</a>
-                at 2022-09-22T18:32:33.570Z
+                at 2022-09-23T08:36:17.800Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -221,7 +221,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-09-22T18:32:33.570Z
+                at 2022-09-23T08:36:17.800Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -217,7 +217,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" rel="noopener noreferrer">istanbul</a>
-                at 2022-09-22T18:32:33.570Z
+                at 2022-09-23T08:36:17.800Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -2196,23 +2196,25 @@ end_of_record
 TN:
 SF:src/lazy/promise.ts
 FN:10,(anonymous_0)
-FN:34,(anonymous_1)
-FN:47,(anonymous_2)
+FN:38,(anonymous_1)
+FN:51,(anonymous_2)
 FN:17,(anonymous_3)
 FN:18,(anonymous_4)
 FN:20,(anonymous_5)
-FN:24,(anonymous_6)
-FN:41,(anonymous_7)
-FNF:8
-FNH:8
+FN:25,(anonymous_6)
+FN:30,(anonymous_7)
+FN:45,(anonymous_8)
+FNF:9
+FNH:9
 FNDA:2,(anonymous_0)
 FNDA:2,(anonymous_1)
 FNDA:1,(anonymous_2)
 FNDA:6,(anonymous_3)
 FNDA:5,(anonymous_4)
-FNDA:2,(anonymous_5)
+FNDA:3,(anonymous_5)
 FNDA:6,(anonymous_6)
-FNDA:1,(anonymous_7)
+FNDA:9,(anonymous_7)
+FNDA:1,(anonymous_8)
 DA:3,1
 DA:5,2
 DA:6,2
@@ -2222,27 +2224,29 @@ DA:12,2
 DA:14,2
 DA:17,6
 DA:18,5
-DA:21,2
-DA:25,6
-DA:26,2
-DA:27,2
-DA:28,2
-DA:31,6
+DA:21,3
+DA:22,3
+DA:26,6
+DA:27,6
+DA:31,9
+DA:32,2
+DA:33,2
 DA:34,2
-DA:35,2
-DA:36,2
-DA:42,1
-DA:43,1
-DA:44,1
-DA:47,2
-LF:22
-LH:22
+DA:38,2
+DA:39,2
+DA:40,2
+DA:46,1
+DA:47,1
+DA:48,1
+DA:51,2
+LF:24
+LH:24
 BRDA:12,0,0,2
-BRDA:36,1,0,2
-BRDA:36,1,1,0
+BRDA:40,1,0,2
+BRDA:40,1,1,0
 BRDA:17,2,0,6
 BRDA:17,2,1,4
-BRDA:25,3,0,2
+BRDA:31,3,0,2
 BRF:6
 BRH:5
 end_of_record

package/lib/lazy/observable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observable.d.ts","sourceRoot":"","sources":["../../src/lazy/observable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,qBAAa,cAAc,CAAC,CAAC,CAAE,SAAQ,IAAI,CAAC,CAAC,CAAC;gBAE9B,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;CASjC;AAED,qBAAa,qBAAqB,CAAC,CAAC,CAAE,SAAQ,WAAW,CAAC,CAAC,CAAC;gBAGpD,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACzB,OAAO,CAAC,EAAE,CAAC;CAWlB"}
+{"version":3,"file":"observable.d.ts","sourceRoot":"","sources":["../../src/lazy/observable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,qBAAa,cAAc,CAAC,CAAC,CAAE,SAAQ,IAAI,CAAC,CAAC,CAAC;gBAE9B,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;CASjC;AAED,qBAAa,qBAAqB,CAAC,CAAC,CAAE,SAAQ,WAAW,CAAC,CAAC,CAAC;gBAGpD,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACzB,OAAO,CAAC,EAAE,CAAC;CAelB"}

package/lib/lazy/observable.js

@@ -22,6 +22,7 @@ class LazyPromiseObservable extends promise_1.LazyPromise {
             _instance: mobx_1.observable.ref,
             _busy: mobx_1.observable,
             setInstance: mobx_1.action,
+            ensureInstanceLoading: mobx_1.action,
             reset: mobx_1.action,
         });
     }

package/lib/lazy/observable.js.map

@@ -1 +1 @@
-{"version":3,"file":"observable.js","sourceRoot":"","sources":["../../src/lazy/observable.ts"],"names":[],"mappings":";;;AAAA,2CAAmC;AACnC,uCAAwC;AACxC,+BAA0D;AAE1D,MAAa,cAAkB,SAAQ,gBAAO;IAE1C,YAAY,OAAkB;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAA,qBAAc,EAA0C,IAAI,EAAE;YAC1D,SAAS,EAAE,iBAAU;YACrB,KAAK,EAAE,aAAM;YACb,cAAc,EAAE,aAAM;SACzB,CAAC,CAAC;IACP,CAAC;CACJ;AAXD,wCAWC;AAED,MAAa,qBAAyB,SAAQ,qBAAc;IAExD,YACI,OAAyB,EACzB,OAAW;QAEX,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAExB,IAAA,qBAAc,EAAwD,IAAI,EAAE;YACxE,SAAS,EAAE,iBAAU,CAAC,GAAG;YACzB,KAAK,EAAE,iBAAU;YACjB,WAAW,EAAE,aAAM;YACnB,KAAK,EAAE,aAAM;SAChB,CAAC,CAAC;IACP,CAAC;CACJ;AAfD,sDAeC"}
+{"version":3,"file":"observable.js","sourceRoot":"","sources":["../../src/lazy/observable.ts"],"names":[],"mappings":";;;AAAA,2CAAmC;AACnC,uCAAwC;AACxC,+BAA0D;AAE1D,MAAa,cAAkB,SAAQ,gBAAO;IAE1C,YAAY,OAAkB;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAA,qBAAc,EAA0C,IAAI,EAAE;YAC1D,SAAS,EAAE,iBAAU;YACrB,KAAK,EAAE,aAAM;YACb,cAAc,EAAE,aAAM;SACzB,CAAC,CAAC;IACP,CAAC;CACJ;AAXD,wCAWC;AAED,MAAa,qBAAyB,SAAQ,qBAAc;IAExD,YACI,OAAyB,EACzB,OAAW;QAEX,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAExB,IAAA,qBAAc,EAGZ,IAAI,EAAE;YACJ,SAAS,EAAE,iBAAU,CAAC,GAAG;YACzB,KAAK,EAAE,iBAAU;YACjB,WAAW,EAAE,aAAM;YACnB,qBAAqB,EAAE,aAAM;YAC7B,KAAK,EAAE,aAAM;SAChB,CAAC,CAAC;IACP,CAAC;CACJ;AAnBD,sDAmBC"}

package/lib/lazy/promise.d.ts

@@ -10,6 +10,7 @@ export declare class LazyPromise<T> implements IDisposable {
     get hasValue(): boolean;
     get promise(): Promise<T>;
     get value(): T;
+    protected ensureInstanceLoading(): void;
     private setInstance;
     reset(): void;
     dispose: () => void;

package/lib/lazy/promise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"promise.d.ts","sourceRoot":"","sources":["../../src/lazy/promise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,qBAAa,WAAW,CAAC,CAAC,CAAE,YAAW,WAAW;IAQ1C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAP5B,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,KAAK,CAAiB;IAE9B,OAAO,CAAC,QAAQ,CAAoB;gBAGf,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC1B,OAAO,GAAE,CAAa;IAK3C,IAAI,IAAI,YAAkC;IAC1C,IAAI,QAAQ,YAAmC;IAE/C,IAAI,OAAO,eAEV;IAED,IAAI,KAAK,MAQR;IAED,OAAO,CAAC,WAAW,CAKjB;IAEF,KAAK;IAML,OAAO,aAAsB;CAChC"}
+{"version":3,"file":"promise.d.ts","sourceRoot":"","sources":["../../src/lazy/promise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,qBAAa,WAAW,CAAC,CAAC,CAAE,YAAW,WAAW;IAQ1C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAP5B,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,KAAK,CAAiB;IAE9B,OAAO,CAAC,QAAQ,CAAoB;gBAGf,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC1B,OAAO,GAAE,CAAa;IAK3C,IAAI,IAAI,YAAkC;IAC1C,IAAI,QAAQ,YAAmC;IAE/C,IAAI,OAAO,eAGV;IAED,IAAI,KAAK,MAGR;IAED,SAAS,CAAC,qBAAqB;IAQ/B,OAAO,CAAC,WAAW,CAKjB;IAEF,KAAK;IAML,OAAO,aAAsB;CAChC"}

package/lib/lazy/promise.js

@@ -19,15 +19,19 @@ class LazyPromise {
     get busy() { return this._busy || false; }
     get hasValue() { return this._busy === false; }
     get promise() {
+        this.ensureInstanceLoading();
         return this._promise;
     }
     get value() {
+        this.ensureInstanceLoading();
+        return this._instance;
+    }
+    ensureInstanceLoading() {
         if (this._busy === null) {
             this._busy = true;
             this._promise = this._factory();
             this._promise.then(this.setInstance);
         }
-        return this._instance;
     }
     reset() {
         this._busy = null;

package/lib/lazy/promise.js.map

@@ -1 +1 @@
-{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../src/lazy/promise.ts"],"names":[],"mappings":";;;AAEA,MAAa,WAAW;IAOpB,YACqB,QAA0B,EAC1B,UAAa,SAAS;QADtB,aAAQ,GAAR,QAAQ,CAAkB;QAC1B,YAAO,GAAP,OAAO,CAAe;QAPnC,cAAS,GAAM,SAAS,CAAC;QACzB,UAAK,GAAY,IAAI,CAAC;QAEtB,aAAQ,GAAe,IAAI,CAAC;QA0B5B,gBAAW,GAAG,CAAC,GAAM,EAAE,EAAE;YAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,SAAS,GAAG,GAAG,IAAI,IAAI,CAAC;YAE7B,mDAAmD;QACvD,CAAC,CAAC;QAQF,YAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAjCzB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC;IAC7B,CAAC;IAED,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;IAC1C,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC;IAE/C,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,IAAI,KAAK;QACL,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE;YACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACxC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IASD,KAAK;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC;CAGJ;AA7CD,kCA6CC"}
+{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../src/lazy/promise.ts"],"names":[],"mappings":";;;AAEA,MAAa,WAAW;IAOpB,YACqB,QAA0B,EAC1B,UAAa,SAAS;QADtB,aAAQ,GAAR,QAAQ,CAAkB;QAC1B,YAAO,GAAP,OAAO,CAAe;QAPnC,cAAS,GAAM,SAAS,CAAC;QACzB,UAAK,GAAY,IAAI,CAAC;QAEtB,aAAQ,GAAe,IAAI,CAAC;QA8B5B,gBAAW,GAAG,CAAC,GAAM,EAAE,EAAE;YAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,SAAS,GAAG,GAAG,IAAI,IAAI,CAAC;YAE7B,mDAAmD;QACvD,CAAC,CAAC;QAQF,YAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QArCzB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC;IAC7B,CAAC;IAED,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;IAC1C,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC;IAE/C,IAAI,OAAO;QACP,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,IAAI,KAAK;QACL,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAES,qBAAqB;QAC3B,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE;YACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACxC;IACL,CAAC;IASD,KAAK;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC;CAGJ;AAjDD,kCAiDC"}

package/package.json

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

package/src/lazy/__tests__/lazy.test.ts

@@ -75,6 +75,7 @@ describe('LazyPromise', () => {
 
         expect(l.value).toBeUndefined();
         expect(l.busy).toBeTrue();
+        expect(l.promise).not.toBeNull();
 
         const listener = jest.fn().mockImplementation();
         const clean = reaction(() => l.value, listener, { fireImmediately: true });

package/src/lazy/observable.ts

@@ -23,10 +23,14 @@ export class LazyPromiseObservable<T> extends LazyPromise<T> {
     ) {
         super(factory, initial);
 
-        makeObservable<LazyPromise<T>, '_instance' | '_busy' | 'setInstance'>(this, {
+        makeObservable<
+            LazyPromise<T>,
+            '_instance' | '_busy' | 'setInstance' | 'ensureInstanceLoading'
+        >(this, {
             _instance: observable.ref,
             _busy: observable,
             setInstance: action,
+            ensureInstanceLoading: action,
             reset: action,
         });
     }

package/src/lazy/promise.ts

@@ -18,17 +18,21 @@ export class LazyPromise<T> implements IDisposable {
     get hasValue() { return this._busy === false; }
 
     get promise() {
+        this.ensureInstanceLoading();
         return this._promise;
     }
 
     get value() {
+        this.ensureInstanceLoading();
+        return this._instance;
+    }
+
+    protected ensureInstanceLoading() {
         if (this._busy === null) {
             this._busy = true;
             this._promise = this._factory();
             this._promise.then(this.setInstance);
         }
-
-        return this._instance;
     }
 
     private setInstance = (res: T) => {

package/yarn.lock

@@ -3235,7 +3235,7 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-typescript@4.8.3:
+typescript@^4.8.3:
   version "4.8.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88"
   integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==