@zajno/common 1.4.5 → 1.4.8

package/lib/event.js.map

@@ -1 +1 @@
-{"version":3,"file":"event.js","sourceRoot":"","sources":["../src/event.ts"],"names":[],"mappings":";;;AAAA,0BAAwB;AACxB,2CAA8C;AAC9C,qCAAiD;AASjD,MAAa,KAAK;IAQd,YAAY,YAA+B;QAPnC,cAAS,GAAsB,EAAE,CAAC;QAClC,YAAO,GAAY,IAAI,CAAC;QAO5B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,YAAY,IAAI,OAAO,YAAY,KAAK,QAAQ,CAAC;YAC9D,CAAC,CAAC,qBAAY,CAAC,UAAU,YAAY,IAAI,GAAG,GAAG,CAAC;YAChD,CAAC,CAAC,YAAY,CAAC;IACvB,CAAC;IAEM,EAAE,CAAC,OAAwB;QAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,OAAO,GAAG,EAAE;YACR,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC;IACN,CAAC;IAEM,GAAG,CAAC,OAAwB;QAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC;IAC/D,CAAC;IAEM,OAAO,CAAC,IAAQ;QACnB,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACZ,IAAI;gBACA,EAAE,CAAC,IAAI,CAAC,CAAC;aACZ;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;aAChC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,IAAQ;QAC9B,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,qBAAY,CAAC,EAAE,EAAE,KAAK,EAAE,EAAmB,EAAE,EAAE;YACjD,IAAI;gBACA,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;aAClB;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;aAChC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM;QACT,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,QAAQ,CAAC,IAAO,EAAE,EAAmB,EAAE,GAAU;QACrD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,OAAO,IAAI,aAAa,EAAE,CAAC,IAAI,wBAAwB,EAAE,GAAG,CAAC,CAAC;IAC/F,CAAC;CACJ;AAtDD,sBAsDC"}
+{"version":3,"file":"event.js","sourceRoot":"","sources":["../src/event.ts"],"names":[],"mappings":";;;AAAA,0BAAwB;AACxB,2CAA8C;AAC9C,qCAAiD;AASjD,MAAa,KAAK;IAQd,YAAY,YAA+B;QAPnC,cAAS,GAAsB,EAAE,CAAC;QAClC,YAAO,GAAY,IAAI,CAAC;QAO5B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,YAAY,IAAI,OAAO,YAAY,KAAK,QAAQ,CAAC;YAC9D,CAAC,CAAC,qBAAY,CAAC,UAAU,YAAY,IAAI,GAAG,GAAG,CAAC;YAChD,CAAC,CAAC,YAAY,CAAC;IACvB,CAAC;IAEM,EAAE,CAAC,OAAwB;QAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,OAAO,GAAG,EAAE;YACR,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC;IACN,CAAC;IAEM,GAAG,CAAC,OAAwB;QAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC;IAC/D,CAAC;IAEM,OAAO,CAAC,IAAQ;QACnB,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACZ,IAAI;gBACA,EAAE,CAAC,IAAI,CAAC,CAAC;aACZ;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;aAChC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,IAAQ;QAC9B,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEnC,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,MAAM,qBAAY,CAAC,EAAE,EAAE,KAAK,EAAE,EAAmB,EAAE,EAAE;YACjD,IAAI;gBACA,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;aAClB;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;gBAE7B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,MAAM;QACT,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,QAAQ,CAAC,IAAO,EAAE,EAAmB,EAAE,GAAU;QACrD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,OAAO,IAAI,aAAa,EAAE,CAAC,IAAI,wBAAwB,EAAE,GAAG,CAAC,CAAC;IAC/F,CAAC;CACJ;AA7DD,sBA6DC"}

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/CommonModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommonModel.d.ts","sourceRoot":"","sources":["../../src/viewModels/CommonModel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,qBAAa,WAAW,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAEzD,OAAO,CAAC,MAAM,CAAI;IAElB,OAAO,CAAC,aAAa,CAAmB;gBAE5B,CAAC,GAAE,MAAM,CAAC,CAAC,CAAQ,EAAE,gBAAgB,UAAO;IAWxD,SAAS,KAAK,eAAe,IAAI,QAAQ,CAAC,CAAC,CAAC,CAE3C;IAED,IAAW,KAAK,IACI,CAAC,CADqB;IAC1C,IAAW,KAAK,CAAC,CAAC,EAAE,CAAC,EAEpB;IAED,SAAgB,QAAQ,UAAW,CAAC,UAMlC;IAEF,KAAK,aAGH;CACL"}
+{"version":3,"file":"CommonModel.d.ts","sourceRoot":"","sources":["../../src/viewModels/CommonModel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,qBAAa,WAAW,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAGzD,OAAO,CAAC,MAAM,CAAI;IAElB,OAAO,CAAC,aAAa,CAAmB;gBAE5B,CAAC,GAAE,MAAM,CAAC,CAAC,CAAQ,EAAE,gBAAgB,UAAO;IAWxD,SAAS,KAAK,eAAe,IAAI,QAAQ,CAAC,CAAC,CAAC,CAE3C;IAED,IAAW,KAAK,IACI,CAAC,CADqB;IAC1C,IAAW,KAAK,CAAC,CAAC,EAAE,CAAC,EAEpB;IAGD,SAAgB,QAAQ,UAAW,CAAC,UAMlC;IAEF,KAAK,aAGH;CACL"}

package/lib/viewModels/CommonModel.js

@@ -8,6 +8,7 @@ class CommonModel extends Validatable_1.ValidatableModel {
     constructor(v = null, useRefObservable = true) {
         super();
         this._defaultValue = null;
+        // action
         this.setValue = (value) => {
             this._value = value;
             if (this._validateOnChange) {

package/lib/viewModels/CommonModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommonModel.js","sourceRoot":"","sources":["../../src/viewModels/CommonModel.ts"],"names":[],"mappings":";;;AAAA,+BAA0D;AAC1D,oCAAkC;AAClC,+CAAiD;AAEjD,MAAa,WAAqB,SAAQ,8BAAmB;IAMzD,YAAY,IAAe,IAAI,EAAE,gBAAgB,GAAG,IAAI;QACpD,KAAK,EAAE,CAAC;QAHJ,kBAAa,GAAc,IAAI,CAAC;QAsBxB,aAAQ,GAAG,CAAC,KAAQ,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YAEpB,IAAI,IAAI,CAAC,iBAAiB,EAAE;gBACxB,IAAI,CAAC,QAAQ,EAAE,CAAC;aACnB;QACL,CAAC,CAAC;QAEF,UAAK,GAAG,GAAG,EAAE;YACT,IAAI,CAAC,MAAM,GAAG,cAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAClD,KAAK,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC,CAAC;QA7BE,IAAI,CAAC,MAAM,GAAG,cAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QAEvB,qBAAc,CAA2B,IAAI,EAAE;YAC3C,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,iBAAU,CAAC,GAAG,CAAC,CAAC,CAAC,iBAAU;YACtD,QAAQ,EAAE,aAAM;SACnB,CAAC,CAAC;IACP,CAAC;IAED,IAAc,eAAe;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAW,KAAK,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1C,IAAW,KAAK,CAAC,CAAI;QACjB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;CAcJ;AAtCD,kCAsCC"}
+{"version":3,"file":"CommonModel.js","sourceRoot":"","sources":["../../src/viewModels/CommonModel.ts"],"names":[],"mappings":";;;AAAA,+BAA0D;AAC1D,oCAAkC;AAClC,+CAAiD;AAEjD,MAAa,WAAqB,SAAQ,8BAAmB;IAOzD,YAAY,IAAe,IAAI,EAAE,gBAAgB,GAAG,IAAI;QACpD,KAAK,EAAE,CAAC;QAHJ,kBAAa,GAAc,IAAI,CAAC;QAsBxC,SAAS;QACO,aAAQ,GAAG,CAAC,KAAQ,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YAEpB,IAAI,IAAI,CAAC,iBAAiB,EAAE;gBACxB,IAAI,CAAC,QAAQ,EAAE,CAAC;aACnB;QACL,CAAC,CAAC;QAEF,UAAK,GAAG,GAAG,EAAE;YACT,IAAI,CAAC,MAAM,GAAG,cAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAClD,KAAK,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC,CAAC;QA9BE,IAAI,CAAC,MAAM,GAAG,cAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QAEvB,qBAAc,CAA2B,IAAI,EAAE;YAC3C,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,iBAAU,CAAC,GAAG,CAAC,CAAC,CAAC,iBAAU;YACtD,QAAQ,EAAE,aAAM;SACnB,CAAC,CAAC;IACP,CAAC;IAED,IAAc,eAAe;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAW,KAAK,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1C,IAAW,KAAK,CAAC,CAAI;QACjB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;CAeJ;AAxCD,kCAwCC"}

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/lib/viewModels/ValueModel.d.ts

@@ -0,0 +1,12 @@
+import { Getter } from '../types';
+import { IValueModel } from './types';
+export declare class ValueModel<T> implements IValueModel<T> {
+    private _value;
+    private _defaultValue;
+    constructor(v?: Getter<T>, useRefObservable?: boolean);
+    get value(): T;
+    set value(v: T);
+    readonly setValue: (value: T) => void;
+    reset: () => void;
+}
+//# sourceMappingURL=ValueModel.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ValueModel.d.ts","sourceRoot":"","sources":["../../src/viewModels/ValueModel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,qBAAa,UAAU,CAAC,CAAC,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;IAEhD,OAAO,CAAC,MAAM,CAAI;IAElB,OAAO,CAAC,aAAa,CAAmB;gBAE5B,CAAC,GAAE,MAAM,CAAC,CAAC,CAAQ,EAAE,gBAAgB,UAAO;IAUxD,IAAW,KAAK,IACI,CAAC,CADqB;IAC1C,IAAW,KAAK,CAAC,CAAC,EAAE,CAAC,EAEpB;IAGD,SAAgB,QAAQ,UAAW,CAAC,UAElC;IAEF,KAAK,aAEH;CACL"}

package/lib/viewModels/ValueModel.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ValueModel = void 0;
+const mobx_1 = require("mobx");
+const types_1 = require("../types");
+class ValueModel {
+    constructor(v = null, useRefObservable = true) {
+        this._defaultValue = null;
+        // action
+        this.setValue = (value) => {
+            this._value = value;
+        };
+        this.reset = () => {
+            this._value = types_1.Getter.getValue(this._defaultValue);
+        };
+        this._value = types_1.Getter.getValue(v) || null;
+        this._defaultValue = v;
+        mobx_1.makeObservable(this, {
+            _value: useRefObservable ? mobx_1.observable.ref : mobx_1.observable,
+            setValue: mobx_1.action,
+        });
+    }
+    get value() { return this._value; }
+    set value(v) {
+        this.setValue(v);
+    }
+}
+exports.ValueModel = ValueModel;
+//# sourceMappingURL=ValueModel.js.map

package/lib/viewModels/ValueModel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ValueModel.js","sourceRoot":"","sources":["../../src/viewModels/ValueModel.ts"],"names":[],"mappings":";;;AAAA,+BAA0D;AAC1D,oCAAkC;AAGlC,MAAa,UAAU;IAMnB,YAAY,IAAe,IAAI,EAAE,gBAAgB,GAAG,IAAI;QAFhD,kBAAa,GAAc,IAAI,CAAC;QAiBxC,SAAS;QACO,aAAQ,GAAG,CAAC,KAAQ,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACxB,CAAC,CAAC;QAEF,UAAK,GAAG,GAAG,EAAE;YACT,IAAI,CAAC,MAAM,GAAG,cAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACtD,CAAC,CAAC;QArBE,IAAI,CAAC,MAAM,GAAG,cAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QAEvB,qBAAc,CAA0B,IAAI,EAAE;YAC1C,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,iBAAU,CAAC,GAAG,CAAC,CAAC,CAAC,iBAAU;YACtD,QAAQ,EAAE,aAAM;SACnB,CAAC,CAAC;IACP,CAAC;IAED,IAAW,KAAK,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1C,IAAW,KAAK,CAAC,CAAI;QACjB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;CAUJ;AA7BD,gCA6BC"}

package/lib/viewModels/index.d.ts

@@ -1,11 +1,12 @@
 export * from './types';
 export * from './Validatable';
 export * from './CommonModel';
+export * from './ValueModel';
 export * from './TextModel';
 export * from './FlagModel';
 export * from './NumberModel';
-export * from './wrappers';
 export * from './SelectModel';
 export * from './MultiSelectModel';
 export * from './PromptModal';
+export * from './wrappers';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/viewModels/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAE3B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AAEnC,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/viewModels/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAE7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAE9B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AAEnC,cAAc,eAAe,CAAC;AAE9B,cAAc,YAAY,CAAC"}

package/lib/viewModels/index.js

@@ -4,11 +4,12 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./types"), exports);
 tslib_1.__exportStar(require("./Validatable"), exports);
 tslib_1.__exportStar(require("./CommonModel"), exports);
+tslib_1.__exportStar(require("./ValueModel"), exports);
 tslib_1.__exportStar(require("./TextModel"), exports);
 tslib_1.__exportStar(require("./FlagModel"), exports);
 tslib_1.__exportStar(require("./NumberModel"), exports);
-tslib_1.__exportStar(require("./wrappers"), exports);
 tslib_1.__exportStar(require("./SelectModel"), exports);
 tslib_1.__exportStar(require("./MultiSelectModel"), exports);
 tslib_1.__exportStar(require("./PromptModal"), exports);
+tslib_1.__exportStar(require("./wrappers"), exports);
 //# sourceMappingURL=index.js.map

package/lib/viewModels/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/viewModels/index.ts"],"names":[],"mappings":";;;AAAA,kDAAwB;AACxB,wDAA8B;AAC9B,wDAA8B;AAC9B,sDAA4B;AAC5B,sDAA4B;AAC5B,wDAA8B;AAC9B,qDAA2B;AAE3B,wDAA8B;AAC9B,6DAAmC;AAEnC,wDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/viewModels/index.ts"],"names":[],"mappings":";;;AAAA,kDAAwB;AACxB,wDAA8B;AAC9B,wDAA8B;AAC9B,uDAA6B;AAE7B,sDAA4B;AAC5B,sDAA4B;AAC5B,wDAA8B;AAE9B,wDAA8B;AAC9B,6DAAmC;AAEnC,wDAA8B;AAE9B,qDAA2B"}

package/package.json

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

package/src/event.ts

@@ -45,15 +45,22 @@ export class Event<T = any> implements IEvent<T> {
         });
     }
 
-    public async triggerAsync(data?: T) {
+    public async triggerAsync(data?: T): Promise<any[] | void> {
         const hh = this._handlers.slice(0);
+
+        const errors = [];
+
         await forEachAsync(hh, async (cb: EventHandler<T>) => {
             try {
                 await cb(data);
             } catch (err) {
                 this.logError(data, cb, err);
+
+                errors.push(err);
             }
         });
+
+        return errors;
     }
 
     public expose(): IEvent<T> {

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/CommonModel.ts

@@ -4,6 +4,7 @@ import { ValidatableModel } from './Validatable';
 
 export class CommonModel<T = any> extends ValidatableModel<T> {
 
+    // observable[.ref]
     private _value: T;
 
     private _defaultValue: Getter<T> = null;
@@ -28,6 +29,7 @@ export class CommonModel<T = any> extends ValidatableModel<T> {
         this.setValue(v);
     }
 
+    // action
     public readonly setValue = (value: T) => {
         this._value = value;
 

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();
+        }
+    }
+}

package/src/viewModels/ValueModel.ts

@@ -0,0 +1,34 @@
+import { action, makeObservable, observable } from 'mobx';
+import { Getter } from '../types';
+import { IValueModel } from './types';
+
+export class ValueModel<T> implements IValueModel<T> {
+    // observable[.ref]
+    private _value: T;
+
+    private _defaultValue: Getter<T> = null;
+
+    constructor(v: Getter<T> = null, useRefObservable = true) {
+        this._value = Getter.getValue(v) || null;
+        this._defaultValue = v;
+
+        makeObservable<ValueModel<T>, '_value'>(this, {
+            _value: useRefObservable ? observable.ref : observable,
+            setValue: action,
+        });
+    }
+
+    public get value() { return this._value; }
+    public set value(v: T) {
+        this.setValue(v);
+    }
+
+    // action
+    public readonly setValue = (value: T) => {
+        this._value = value;
+    };
+
+    reset = () => {
+        this._value = Getter.getValue(this._defaultValue);
+    };
+}

package/src/viewModels/index.ts

@@ -1,12 +1,15 @@
 export * from './types';
 export * from './Validatable';
 export * from './CommonModel';
+export * from './ValueModel';
+
 export * from './TextModel';
 export * from './FlagModel';
 export * from './NumberModel';
-export * from './wrappers';
 
 export * from './SelectModel';
 export * from './MultiSelectModel';
 
 export * from './PromptModal';
+
+export * from './wrappers';