npm - @zajno/common - Versions diffs - 1.6.3 → 1.6.4 - Mend

@zajno/common 1.6.3 → 1.6.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (148) hide show

package/coverage/lcov-report/viewModels/ValueModel.ts.html ADDED Viewed

@@ -0,0 +1,127 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <title>Code coverage report for viewModels/ValueModel.ts</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="../prettify.css" />
+    <link rel="stylesheet" href="../base.css" />
+    <link rel="shortcut icon" type="image/x-icon" href="../favicon.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <style type='text/css'>
+        .coverage-summary .sorter {
+            background-image: url(../sort-arrow-sprite.png);
+        }
+    </style>
+</head>
+<body>
+<div class='wrapper'>
+    <div class='pad1'>
+        <h1><a href="../index.html">All files</a> / <a href="index.html">viewModels</a> ValueModel.ts</h1>
+        <div class='clearfix'>
+            <div class='fl pad1y space-right2'>
+                <span class="strong">100% </span>
+                <span class="quiet">Statements</span>
+                <span class='fraction'>5/5</span>
+            </div>
+            <div class='fl pad1y space-right2'>
+                <span class="strong">75% </span>
+                <span class="quiet">Branches</span>
+                <span class='fraction'>3/4</span>
+            </div>
+            <div class='fl pad1y space-right2'>
+                <span class="strong">100% </span>
+                <span class="quiet">Functions</span>
+                <span class='fraction'>1/1</span>
+            </div>
+            <div class='fl pad1y space-right2'>
+                <span class="strong">100% </span>
+                <span class="quiet">Lines</span>
+                <span class='fraction'>5/5</span>
+            </div>
+        </div>
+        <p class="quiet">
+            Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
+        </p>
+        <template id="filterTemplate">
+            <div class="quiet">
+                Filter:
+                <input oninput="onInput()" type="search" id="fileSearch">
+            </div>
+        </template>
+    </div>
+    <div class='status-line high'></div>
+    <pre><table class="coverage">
+<tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
+<a name='L2'></a><a href='#L2'>2</a>
+<a name='L3'></a><a href='#L3'>3</a>
+<a name='L4'></a><a href='#L4'>4</a>
+<a name='L5'></a><a href='#L5'>5</a>
+<a name='L6'></a><a href='#L6'>6</a>
+<a name='L7'></a><a href='#L7'>7</a>
+<a name='L8'></a><a href='#L8'>8</a>
+<a name='L9'></a><a href='#L9'>9</a>
+<a name='L10'></a><a href='#L10'>10</a>
+<a name='L11'></a><a href='#L11'>11</a>
+<a name='L12'></a><a href='#L12'>12</a>
+<a name='L13'></a><a href='#L13'>13</a>
+<a name='L14'></a><a href='#L14'>14</a>
+<a name='L15'></a><a href='#L15'>15</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { action, makeObservable, observable } from 'mobx';
+import { Getter } from '../types';
+import { Model } from './Model';
+&nbsp;
+export class ValueModel&lt;T&gt; extends Model&lt;T&gt; {
+    constructor(v: Getter&lt;T&gt; = null, useRefObservable = true) {
+        super(v);
+&nbsp;
+        makeObservable&lt;ValueModel&lt;T&gt;, '_value'&gt;(this, {
+            _value: useRefObservable ? observable.ref : <span class="branch-1 cbranch-no" title="branch not covered" >observable,</span>
+            setValue: action,
+        });
+    }
+}
+&nbsp;</pre></td></tr></table></pre>
+                <div class='push'></div><!-- for sticky footer -->
+            </div><!-- /wrapper -->
+            <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-11-16T15:21:12.153Z
+            </div>
+        <script src="../prettify.js"></script>
+        <script>
+            window.onload = function () {
+                prettyPrint();
+            };
+        </script>
+        <script src="../sorter.js"></script>
+        <script src="../block-navigation.js"></script>
+    </body>
+</html>

package/coverage/lcov-report/viewModels/index.html CHANGED Viewed

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">95.24% </span>
+                <span class="strong">58.66% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>20/21</span>
+                <span class='fraction'>105/179</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">87.5% </span>
+                <span class="strong">42.59% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>7/8</span>
+                <span class='fraction'>23/54</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">85.71% </span>
+                <span class="strong">37.88% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>6/7</span>
+                <span class='fraction'>25/66</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
+                <span class="strong">60.36% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>20/20</span>
+                <span class='fraction'>102/169</span>
             </div>
@@ -61,7 +61,7 @@
             </div>
         </template>
     </div>
-    <div class='status-line high'></div>
+    <div class='status-line medium'></div>
     <div class="pad1">
 <table class="coverage-summary">
 <thead>
@@ -79,6 +79,21 @@
 </tr>
 </thead>
 <tbody><tr>
+	<td class="file high" data-value="CommonModel.ts"><a href="CommonModel.ts.html">CommonModel.ts</a></td>
+	<td data-value="100" class="pic high">
+	<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
+	</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="19" class="abs high">19/19</td>
+	<td data-value="42.86" class="pct low">42.86%</td>
+	<td data-value="7" class="abs low">3/7</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="6" class="abs high">6/6</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="19" class="abs high">19/19</td>
+	</tr>
+<tr>
 	<td class="file high" data-value="LoadingModel.ts"><a href="LoadingModel.ts.html">LoadingModel.ts</a></td>
 	<td data-value="95.24" class="pic high">
 	<div class="chart"><div class="cover-fill" style="width: 95%"></div><div class="cover-empty" style="width: 5%"></div></div>
@@ -93,6 +108,66 @@
 	<td data-value="20" class="abs high">20/20</td>
 	</tr>
+<tr>
+	<td class="file high" data-value="Model.ts"><a href="Model.ts.html">Model.ts</a></td>
+	<td data-value="100" class="pic high">
+	<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
+	</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="11" class="abs high">11/11</td>
+	<td data-value="66.67" class="pct medium">66.67%</td>
+	<td data-value="3" class="abs medium">2/3</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="5" class="abs high">5/5</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="11" class="abs high">11/11</td>
+	</tr>
+<tr>
+	<td class="file low" data-value="SelectModel.ts"><a href="SelectModel.ts.html">SelectModel.ts</a></td>
+	<td data-value="33.33" class="pic low">
+	<div class="chart"><div class="cover-fill" style="width: 33%"></div><div class="cover-empty" style="width: 67%"></div></div>
+	</td>
+	<td data-value="33.33" class="pct low">33.33%</td>
+	<td data-value="66" class="abs low">22/66</td>
+	<td data-value="8.33" class="pct low">8.33%</td>
+	<td data-value="12" class="abs low">1/12</td>
+	<td data-value="7.69" class="pct low">7.69%</td>
+	<td data-value="26" class="abs low">2/26</td>
+	<td data-value="36.07" class="pct low">36.07%</td>
+	<td data-value="61" class="abs low">22/61</td>
+	</tr>
+<tr>
+	<td class="file low" data-value="TextModel.ts"><a href="TextModel.ts.html">TextModel.ts</a></td>
+	<td data-value="49.12" class="pic low">
+	<div class="chart"><div class="cover-fill" style="width: 49%"></div><div class="cover-empty" style="width: 51%"></div></div>
+	</td>
+	<td data-value="49.12" class="pct low">49.12%</td>
+	<td data-value="57" class="abs low">28/57</td>
+	<td data-value="35" class="pct low">35%</td>
+	<td data-value="20" class="abs low">7/20</td>
+	<td data-value="23.81" class="pct low">23.81%</td>
+	<td data-value="21" class="abs low">5/21</td>
+	<td data-value="47.17" class="pct low">47.17%</td>
+	<td data-value="53" class="abs low">25/53</td>
+	</tr>
+<tr>
+	<td class="file high" data-value="ValueModel.ts"><a href="ValueModel.ts.html">ValueModel.ts</a></td>
+	<td data-value="100" class="pic high">
+	<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
+	</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="5" class="abs high">5/5</td>
+	<td data-value="75" class="pct medium">75%</td>
+	<td data-value="4" class="abs medium">3/4</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="1" class="abs high">1/1</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="5" class="abs high">5/5</td>
+	</tr>
 </tbody>
 </table>
 </div>
@@ -101,7 +176,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-10-29T12:13:47.151Z
+                at 2022-11-16T15:21:12.153Z
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info CHANGED Viewed

@@ -990,21 +990,21 @@ FN:25,(anonymous_3)
 FNF:4
 FNH:4
 FNDA:12,(anonymous_0)
-FNDA:111,getValue
+FNDA:114,getValue
 FNDA:12,(anonymous_2)
 FNDA:7,(anonymous_3)
 DA:9,12
 DA:10,12
-DA:11,111
-DA:12,10
-DA:14,101
+DA:11,114
+DA:12,11
+DA:14,103
 DA:15,77
-DA:17,24
+DA:17,26
 DA:24,12
 DA:25,12
 LF:9
 LH:9
-BRDA:11,0,0,10
+BRDA:11,0,0,11
 BRDA:14,1,0,77
 BRDA:9,2,0,12
 BRDA:9,2,1,12
@@ -3642,6 +3642,39 @@ BRF:8
 BRH:7
 end_of_record
 TN:
+SF:src/viewModels/Model.ts
+FN:9,(anonymous_0)
+FN:19,(anonymous_1)
+FN:23,(anonymous_2)
+FN:14,(anonymous_3)
+FN:15,(anonymous_4)
+FNF:5
+FNH:5
+FNDA:2,(anonymous_0)
+FNDA:2,(anonymous_1)
+FNDA:1,(anonymous_2)
+FNDA:3,(anonymous_3)
+FNDA:1,(anonymous_4)
+DA:2,1
+DA:4,1
+DA:7,2
+DA:10,2
+DA:11,2
+DA:14,3
+DA:16,1
+DA:19,2
+DA:20,2
+DA:23,2
+DA:24,1
+LF:11
+LH:11
+BRDA:9,0,0,0
+BRDA:10,1,0,2
+BRDA:10,1,1,1
+BRF:3
+BRH:2
+end_of_record
+TN:
 SF:src/viewModels/MultiSelectModel.ts
 FN:21,(anonymous_0)
 FN:18,(anonymous_1)
@@ -4234,6 +4267,26 @@ BRF:21
 BRH:14
 end_of_record
 TN:
+SF:src/viewModels/ValueModel.ts
+FN:6,(anonymous_0)
+FNF:1
+FNH:1
+FNDA:2,(anonymous_0)
+DA:1,1
+DA:3,1
+DA:5,1
+DA:7,2
+DA:9,2
+LF:5
+LH:5
+BRDA:6,0,0,1
+BRDA:6,1,0,2
+BRDA:10,2,0,2
+BRDA:10,2,1,0
+BRF:4
+BRH:3
+end_of_record
+TN:
 SF:src/viewModels/wrappers.ts
 FN:4,withLabel
 FN:9,(anonymous_1)

package/lib/viewModels/Model.d.ts ADDED Viewed

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

package/lib/viewModels/Model.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../src/viewModels/Model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBAAa,KAAK,CAAC,CAAC,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;IAC3C,OAAO,CAAC,MAAM,CAAI;IAElB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAmB;gBAErC,CAAC,GAAE,MAAM,CAAC,CAAC,CAAQ;IAK/B,IAAW,KAAK,IACI,CAAC,CADqB;IAC1C,IAAW,KAAK,CAAC,CAAC,EAAE,CAAC,EAEpB;IAED,SAAgB,QAAQ,UAAW,CAAC,UAElC;IAEF,SAAgB,KAAK,aAEnB;CACL"}

package/lib/viewModels/Model.js ADDED Viewed

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

package/lib/viewModels/Model.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"Model.js","sourceRoot":"","sources":["../../src/viewModels/Model.ts"],"names":[],"mappings":";;;AACA,oCAAkC;AAElC,MAAa,KAAK;IAKd,YAAY,IAAe,IAAI;QAFd,kBAAa,GAAc,IAAI,CAAC;QAYjC,aAAQ,GAAG,CAAC,KAAQ,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACxB,CAAC,CAAC;QAEc,UAAK,GAAG,GAAG,EAAE;YACzB,IAAI,CAAC,QAAQ,CAAC,cAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;QACvD,CAAC,CAAC;QAfE,IAAI,CAAC,MAAM,GAAG,cAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;IAC3B,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;CASJ;AAtBD,sBAsBC"}

package/lib/viewModels/ValueModel.d.ts CHANGED Viewed

@@ -1,12 +1,6 @@
 import { Getter } from '../types';
-import { IValueModel } from './types';
-export declare class ValueModel<T> implements IValueModel<T> {
-    private _value;
-    private _defaultValue;
+import { Model } from './Model';
+export declare class ValueModel<T> extends Model<T> {
     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 CHANGED Viewed

	@@ -1 +1 @@
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~~"}
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,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,qBAAa,UAAU,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;gBAC3B,CAAC,GAAE,MAAM,CAAC,CAAC,CAAQ,EAAE,gBAAgB,UAAO;CAQ3D"}

package/lib/viewModels/ValueModel.js CHANGED Viewed

@@ -2,28 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValueModel = void 0;
 const mobx_1 = require("mobx");
-const types_1 = require("../types");
-class ValueModel {
+const Model_1 = require("./Model");
+class ValueModel extends Model_1.Model {
     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;
+        super(v);
         (0, 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 CHANGED Viewed

	@@ -1 +1 @@
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,~~IAAA,qBAAc,EAA0B,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~~"}
1	+ {"version":3,"file":"ValueModel.js","sourceRoot":"","sources":["../../src/viewModels/ValueModel.ts"],"names":[],"mappings":";;;AAAA,+BAA0D;AAE1D,mCAAgC;AAEhC,MAAa,UAAc,SAAQ,aAAQ;IACvC,YAAY,IAAe,IAAI,EAAE,gBAAgB,GAAG,IAAI;QACpD,KAAK,CAAC,CAAC,CAAC,CAAC;QAET,IAAA,qBAAc,EAA0B,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;CACJ;AATD,gCASC"}

package/package.json CHANGED Viewed

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

package/src/viewModels/Model.ts ADDED Viewed

@@ -0,0 +1,26 @@
+import type { IValueModel } from './types';
+import { Getter } from '../types';
+export class Model<T> implements IValueModel<T> {
+    private _value: T;
+    private readonly _defaultValue: Getter<T> = null;
+    constructor(v: Getter<T> = null) {
+        this._value = Getter.getValue(v) || null;
+        this._defaultValue = v;
+    }
+    public get value() { return this._value; }
+    public set value(v: T) {
+        this.setValue(v);
+    }
+    public readonly setValue = (value: T) => {
+        this._value = value;
+    };
+    public readonly reset = () => {
+        this.setValue(Getter.getValue(this._defaultValue));
+    };
+}

package/src/viewModels/ValueModel.ts CHANGED Viewed

@@ -1,34 +1,14 @@
 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;
+import { Model } from './Model';
+export class ValueModel<T> extends Model<T> {
     constructor(v: Getter<T> = null, useRefObservable = true) {
-        this._value = Getter.getValue(v) || null;
-        this._defaultValue = v;
+        super(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/__tests__/common.test.ts CHANGED Viewed

@@ -4,13 +4,15 @@ import { LoadingModel } from '../LoadingModel';
 import { setTimeoutAsync } from '../../async/timeout';
 import { SelectString } from '../SelectModel';
 import { TextInputVM } from '../TextModel';
+import { ValueModel } from '../ValueModel';
+import { reaction } from 'mobx';
 describe('CommonModel', () => {
     const NotEmptyError = 'should be not empty';
     it('works', async () => {
-        let m: CommonModel<string[]>;
+        let m: CommonModel<string[]> = null;
         const fn = async () => {
             m = new CommonModel<string[]>(() => [], true)
@@ -103,5 +105,29 @@ describe('Others', () => {
             return new TextInputVM();
         })()).resolves.not.toThrow();
+        await expect((async () => {
+            return new ValueModel();
+        })()).resolves.not.toThrow();
+    });
+    describe('ValueModel', () => {
+        it('observable', () => {
+            const vm = new ValueModel(123);
+            const sub = jest.fn();
+            const unsub = reaction(() => vm.value, v => sub(v));
+            vm.value = 321;
+            expect(sub).toHaveBeenCalledWith(321);
+            sub.mockClear();
+            vm.reset();
+            expect(sub).toHaveBeenCalledWith(123);
+            unsub();
+        });
     });
 });