reactant-model 0.13.1 → 0.16.0

package/build/model.js

@@ -20,12 +20,12 @@ export var model = function (scheme) {
                 var inversePatches;
                 if (module[enablePatchesKey]) {
                     _a = __read(produceWithPatches(module[stateKey], function (draftState) {
-                        fn.apply(void 0, __spreadArray([], __read(args)))(draftState);
+                        fn.apply(void 0, __spreadArray([], __read(args), false))(draftState);
                     }), 3), state = _a[0], patches = _a[1], inversePatches = _a[2];
                 }
                 else {
                     state = produce(module[stateKey], function (draftState) {
-                        fn.apply(void 0, __spreadArray([], __read(args)))(draftState);
+                        fn.apply(void 0, __spreadArray([], __read(args), false))(draftState);
                     });
                 }
                 var lastState = (_c = module[storeKey]) === null || _c === void 0 ? void 0 : _c.getState();

package/build/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAoB,MAAM,OAAO,CAAC;AACtE,OAAO,EACL,QAAQ,EAER,QAAQ,EACR,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,OAAO,GACR,MAAM,iBAAiB,CAAC;AAYzB,MAAM,CAAC,IAAM,KAAK,GAAG,UAInB,MAAoB;;IAEpB,IAAI,MAAkB,CAAC;IACvB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAC,GAAG;;QACtC,IAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO;YAC1B,GAAC,GAAG,IAAG;;;gBAAC,cAAc;qBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;oBAAd,yBAAc;;gBACpB,IAAI,KAAmC,CAAC;gBACxC,IAAI,OAA4B,CAAC;gBACjC,IAAI,cAAmC,CAAC;gBACxC,IAAI,MAAM,CAAC,gBAAgB,CAAC,EAAE;oBAC5B,KAAA,OAAmC,kBAAkB,CACnD,MAAM,CAAC,QAAQ,CAAC,EAChB,UAAC,UAAa;wBACZ,EAAE,wCAAI,IAAI,IAAE,UAAU,CAAC,CAAC;oBAC1B,CAAC,CACF,IAAA,EALA,KAAK,QAAA,EAAE,OAAO,QAAA,EAAE,cAAc,QAAA,CAK7B;iBACH;qBAAM;oBACL,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAC,UAAa;wBAC9C,EAAE,wCAAI,IAAI,IAAE,UAAU,CAAC,CAAC;oBAC1B,CAAC,CAAC,CAAC;iBACJ;gBACD,IAAM,SAAS,GAAG,MAAA,MAAM,CAAC,QAAQ,CAAC,0CAAE,QAAQ,EAAE,CAAC;gBAC/C,MAAM,CAAC,QAAQ,CAAE,CAAC,QAAQ,YACxB,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC,EAC3B,MAAM,EAAE,GAAG,EACX,KAAK,wBACA,SAAS,gBACX,MAAM,CAAC,aAAa,CAAE,IAAG,KAAK,QAEjC,SAAS,EAAE,gBAAgB,IACxB,CAAC,MAAM,CAAC,gBAAgB,CAAC;oBAC1B,CAAC,CAAC;wBACE,QAAQ,EAAE,OAAO;wBACjB,eAAe,EAAE,cAAc;qBAChC;oBACH,CAAC,CAAC,EAAE,CAAC,EACP,CAAC;YACL,CAAC;gBACD,CAAC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,yBACH,OAAO,IAAG,MAAM,CAAC,IAAI,KACrB,QAAQ,iBACJ,MAAM,CAAC,KAAK,QAEd,MAAM,CAAC,OAAO,CAClB,CAAC;IACF,OAAO,MAAa,CAAC;AACvB,CAAC,CAAC"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAoB,MAAM,OAAO,CAAC;AACtE,OAAO,EACL,QAAQ,EAER,QAAQ,EACR,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,OAAO,GACR,MAAM,iBAAiB,CAAC;AAYzB,MAAM,CAAC,IAAM,KAAK,GAAG,UAInB,MAAoB;;IAEpB,IAAI,MAAkB,CAAC;IACvB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAC,GAAG;;QACtC,IAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO;YAC1B,GAAC,GAAG,IAAG;;;gBAAC,cAAc;qBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;oBAAd,yBAAc;;gBACpB,IAAI,KAAmC,CAAC;gBACxC,IAAI,OAA4B,CAAC;gBACjC,IAAI,cAAmC,CAAC;gBACxC,IAAI,MAAM,CAAC,gBAAgB,CAAC,EAAE;oBAC5B,KAAA,OAAmC,kBAAkB,CACnD,MAAM,CAAC,QAAQ,CAAC,EAChB,UAAC,UAAa;wBACZ,EAAE,wCAAI,IAAI,WAAE,UAAU,CAAC,CAAC;oBAC1B,CAAC,CACF,IAAA,EALA,KAAK,QAAA,EAAE,OAAO,QAAA,EAAE,cAAc,QAAA,CAK7B;iBACH;qBAAM;oBACL,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAC,UAAa;wBAC9C,EAAE,wCAAI,IAAI,WAAE,UAAU,CAAC,CAAC;oBAC1B,CAAC,CAAC,CAAC;iBACJ;gBACD,IAAM,SAAS,GAAG,MAAA,MAAM,CAAC,QAAQ,CAAC,0CAAE,QAAQ,EAAE,CAAC;gBAC/C,MAAM,CAAC,QAAQ,CAAE,CAAC,QAAQ,YACxB,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC,EAC3B,MAAM,EAAE,GAAG,EACX,KAAK,wBACA,SAAS,gBACX,MAAM,CAAC,aAAa,CAAE,IAAG,KAAK,QAEjC,SAAS,EAAE,gBAAgB,IACxB,CAAC,MAAM,CAAC,gBAAgB,CAAC;oBAC1B,CAAC,CAAC;wBACE,QAAQ,EAAE,OAAO;wBACjB,eAAe,EAAE,cAAc;qBAChC;oBACH,CAAC,CAAC,EAAE,CAAC,EACP,CAAC;YACL,CAAC;gBACD,CAAC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,yBACH,OAAO,IAAG,MAAM,CAAC,IAAI,KACrB,QAAQ,iBACJ,MAAM,CAAC,KAAK,QAEd,MAAM,CAAC,OAAO,CAClB,CAAC;IACF,OAAO,MAAa,CAAC;AACvB,CAAC,CAAC"}

package/dist/index.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("immer"),t=require("reactant-module"),r=function(){return(r=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var a in t=arguments[r])Object.prototype.hasOwnProperty.call(t,a)&&(e[a]=t[a]);return e}).apply(this,arguments)};function n(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var n,a,o=r.call(e),i=[];try{for(;(void 0===t||t-- >0)&&!(n=o.next()).done;)i.push(n.value)}catch(e){a={error:e}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(a)throw a.error}}return i}function a(e,t,r){if(r||2===arguments.length)for(var n,a=0,o=t.length;a<o;a++)!n&&a in t||(n||(n=Array.prototype.slice.call(t,0,a)),n[a]=t[a]);return e.concat(n||Array.prototype.slice.call(t))}exports.model=function(o){var i,c;return Object.keys(o.actions).forEach((function(i){var l,s=o.actions[i];Object.assign(o.actions,((l={})[i]=function(){for(var o,l,y,u,f,p,d=[],h=0;h<arguments.length;h++)d[h]=arguments[h];c[t.enablePatchesKey]?(u=(o=n(e.produceWithPatches(c[t.stateKey],(function(e){s.apply(void 0,a([],n(d)))(e)})),3))[0],f=o[1],p=o[2]):u=e.produce(c[t.stateKey],(function(e){s.apply(void 0,a([],n(d)))(e)}));var v=null===(y=c[t.storeKey])||void 0===y?void 0:y.getState();c[t.storeKey].dispatch(r({type:c[t.identifierKey],method:i,state:r(r({},v),(l={},l[c[t.identifierKey]]=u,l)),_reactant:t.actionIdentifier},c[t.enablePatchesKey]?{_patches:f,_inversePatches:p}:{}))},l))})),c=r(((i={})[t.nameKey]=o.name,i[t.stateKey]=r({},o.state),i),o.actions)};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("immer"),t=require("reactant-module"),r=function(){return(r=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var a in t=arguments[r])Object.prototype.hasOwnProperty.call(t,a)&&(e[a]=t[a]);return e}).apply(this,arguments)};function n(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var n,a,o=r.call(e),i=[];try{for(;(void 0===t||t-- >0)&&!(n=o.next()).done;)i.push(n.value)}catch(e){a={error:e}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(a)throw a.error}}return i}function a(e,t,r){if(r||2===arguments.length)for(var n,a=0,o=t.length;a<o;a++)!n&&a in t||(n||(n=Array.prototype.slice.call(t,0,a)),n[a]=t[a]);return e.concat(n||Array.prototype.slice.call(t))}exports.model=function(o){var i,c;return Object.keys(o.actions).forEach((function(i){var l,s=o.actions[i];Object.assign(o.actions,((l={})[i]=function(){for(var o,l,y,u,f,p,d=[],h=0;h<arguments.length;h++)d[h]=arguments[h];c[t.enablePatchesKey]?(u=(o=n(e.produceWithPatches(c[t.stateKey],(function(e){s.apply(void 0,a([],n(d),!1))(e)})),3))[0],f=o[1],p=o[2]):u=e.produce(c[t.stateKey],(function(e){s.apply(void 0,a([],n(d),!1))(e)}));var v=null===(y=c[t.storeKey])||void 0===y?void 0:y.getState();c[t.storeKey].dispatch(r({type:c[t.identifierKey],method:i,state:r(r({},v),(l={},l[c[t.identifierKey]]=u,l)),_reactant:t.actionIdentifier},c[t.enablePatchesKey]?{_patches:f,_inversePatches:p}:{}))},l))})),c=r(((i={})[t.nameKey]=o.name,i[t.stateKey]=r({},o.state),i),o.actions)};

package/dist/index.esm.js

@@ -12,4 +12,4 @@ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */var l=function(){return(l=Object.assign||function(t){for(var r,n=1,o=arguments.length;n<o;n++)for(var a in r=arguments[n])Object.prototype.hasOwnProperty.call(r,a)&&(t[a]=r[a]);return t}).apply(this,arguments)};function f(t,r){var n="function"==typeof Symbol&&t[Symbol.iterator];if(!n)return t;var o,a,e=n.call(t),i=[];try{for(;(void 0===r||r-- >0)&&!(o=e.next()).done;)i.push(o.value)}catch(t){a={error:t}}finally{try{o&&!o.done&&(n=e.return)&&n.call(e)}finally{if(a)throw a.error}}return i}function p(t,r,n){if(n||2===arguments.length)for(var o,a=0,e=r.length;a<e;a++)!o&&a in r||(o||(o=Array.prototype.slice.call(r,0,a)),o[a]=r[a]);return t.concat(o||Array.prototype.slice.call(r))}var u=function(u){var s,v;return Object.keys(u.actions).forEach((function(c){var s,y=u.actions[c];Object.assign(u.actions,((s={})[c]=function(){for(var u,s,h,m,d,g,b=[],O=0;O<arguments.length;O++)b[O]=arguments[O];v[n]?(m=(u=f(r(v[o],(function(t){y.apply(void 0,p([],f(b)))(t)})),3))[0],d=u[1],g=u[2]):m=t(v[o],(function(t){y.apply(void 0,p([],f(b)))(t)}));var j=null===(h=v[a])||void 0===h?void 0:h.getState();v[a].dispatch(l({type:v[e],method:c,state:l(l({},j),(s={},s[v[e]]=m,s)),_reactant:i},v[n]?{_patches:d,_inversePatches:g}:{}))},s))})),v=l(((s={})[c]=u.name,s[o]=l({},u.state),s),u.actions)};export{u as model};
+***************************************************************************** */var l=function(){return(l=Object.assign||function(t){for(var r,n=1,o=arguments.length;n<o;n++)for(var a in r=arguments[n])Object.prototype.hasOwnProperty.call(r,a)&&(t[a]=r[a]);return t}).apply(this,arguments)};function f(t,r){var n="function"==typeof Symbol&&t[Symbol.iterator];if(!n)return t;var o,a,e=n.call(t),i=[];try{for(;(void 0===r||r-- >0)&&!(o=e.next()).done;)i.push(o.value)}catch(t){a={error:t}}finally{try{o&&!o.done&&(n=e.return)&&n.call(e)}finally{if(a)throw a.error}}return i}function p(t,r,n){if(n||2===arguments.length)for(var o,a=0,e=r.length;a<e;a++)!o&&a in r||(o||(o=Array.prototype.slice.call(r,0,a)),o[a]=r[a]);return t.concat(o||Array.prototype.slice.call(r))}var u=function(u){var s,v;return Object.keys(u.actions).forEach((function(c){var s,y=u.actions[c];Object.assign(u.actions,((s={})[c]=function(){for(var u,s,h,m,d,g,b=[],O=0;O<arguments.length;O++)b[O]=arguments[O];v[n]?(m=(u=f(r(v[o],(function(t){y.apply(void 0,p([],f(b),!1))(t)})),3))[0],d=u[1],g=u[2]):m=t(v[o],(function(t){y.apply(void 0,p([],f(b),!1))(t)}));var j=null===(h=v[a])||void 0===h?void 0:h.getState();v[a].dispatch(l({type:v[e],method:c,state:l(l({},j),(s={},s[v[e]]=m,s)),_reactant:i},v[n]?{_patches:d,_inversePatches:g}:{}))},s))})),v=l(((s={})[c]=u.name,s[o]=l({},u.state),s),u.actions)};export{u as model};

package/dist/index.umd.js

@@ -12,4 +12,4 @@
     LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
     OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
     PERFORMANCE OF THIS SOFTWARE.
-    ***************************************************************************** */var n=function(){return(n=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var o in t=arguments[r])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)};function o(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var n,o,a=r.call(e),i=[];try{for(;(void 0===t||t-- >0)&&!(n=a.next()).done;)i.push(n.value)}catch(e){o={error:e}}finally{try{n&&!n.done&&(r=a.return)&&r.call(a)}finally{if(o)throw o.error}}return i}function a(e,t,r){if(r||2===arguments.length)for(var n,o=0,a=t.length;o<a;o++)!n&&o in t||(n||(n=Array.prototype.slice.call(t,0,o)),n[o]=t[o]);return e.concat(n||Array.prototype.slice.call(t))}e.model=function(e){var i,c;return Object.keys(e.actions).forEach((function(i){var l,f=e.actions[i];Object.assign(e.actions,((l={})[i]=function(){for(var e,l,s,u,y,d,p=[],h=0;h<arguments.length;h++)p[h]=arguments[h];c[r.enablePatchesKey]?(u=(e=o(t.produceWithPatches(c[r.stateKey],(function(e){f.apply(void 0,a([],o(p)))(e)})),3))[0],y=e[1],d=e[2]):u=t.produce(c[r.stateKey],(function(e){f.apply(void 0,a([],o(p)))(e)}));var v=null===(s=c[r.storeKey])||void 0===s?void 0:s.getState();c[r.storeKey].dispatch(n({type:c[r.identifierKey],method:i,state:n(n({},v),(l={},l[c[r.identifierKey]]=u,l)),_reactant:r.actionIdentifier},c[r.enablePatchesKey]?{_patches:y,_inversePatches:d}:{}))},l))})),c=n(((i={})[r.nameKey]=e.name,i[r.stateKey]=n({},e.state),i),e.actions)},Object.defineProperty(e,"__esModule",{value:!0})}));
+    ***************************************************************************** */var n=function(){return(n=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var o in t=arguments[r])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)};function o(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var n,o,a=r.call(e),i=[];try{for(;(void 0===t||t-- >0)&&!(n=a.next()).done;)i.push(n.value)}catch(e){o={error:e}}finally{try{n&&!n.done&&(r=a.return)&&r.call(a)}finally{if(o)throw o.error}}return i}function a(e,t,r){if(r||2===arguments.length)for(var n,o=0,a=t.length;o<a;o++)!n&&o in t||(n||(n=Array.prototype.slice.call(t,0,o)),n[o]=t[o]);return e.concat(n||Array.prototype.slice.call(t))}e.model=function(e){var i,c;return Object.keys(e.actions).forEach((function(i){var l,f=e.actions[i];Object.assign(e.actions,((l={})[i]=function(){for(var e,l,s,u,y,d,p=[],h=0;h<arguments.length;h++)p[h]=arguments[h];c[r.enablePatchesKey]?(u=(e=o(t.produceWithPatches(c[r.stateKey],(function(e){f.apply(void 0,a([],o(p),!1))(e)})),3))[0],y=e[1],d=e[2]):u=t.produce(c[r.stateKey],(function(e){f.apply(void 0,a([],o(p),!1))(e)}));var v=null===(s=c[r.storeKey])||void 0===s?void 0:s.getState();c[r.storeKey].dispatch(n({type:c[r.identifierKey],method:i,state:n(n({},v),(l={},l[c[r.identifierKey]]=u,l)),_reactant:r.actionIdentifier},c[r.enablePatchesKey]?{_patches:y,_inversePatches:d}:{}))},l))})),c=n(((i={})[r.nameKey]=e.name,i[r.stateKey]=n({},e.state),i),e.actions)},Object.defineProperty(e,"__esModule",{value:!0})}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactant-model",
-  "version": "0.13.1",
+  "version": "0.16.0",
   "description": "A model lib for Reactant",
   "main": "dist/index.cjs.js",
   "unpkg": "dist/index.umd.js",
@@ -18,6 +18,6 @@
   },
   "devDependencies": {
     "immer": "^9.0.5",
-    "reactant-module": "^0.13.1"
+    "reactant-module": "^0.16.0"
   }
 }

package/test/index.test.ts

@@ -50,15 +50,15 @@ test('base model with `useValue`', () => {
     },
   });
   const foo = container.get(Foo);
-  const store = createStore(
+  const store = createStore({
     modules,
     container,
     ServiceIdentifiers,
-    new Set(),
-    (...args: any[]) => {
+    loadedModules: new Set(),
+    load: (...args: any[]) => {
       //
     },
-    {
+    pluginHooks: {
       middleware: [],
       beforeCombineRootReducers: [],
       afterCombineRootReducers: [],
@@ -66,8 +66,8 @@ test('base model with `useValue`', () => {
       preloadedStateHandler: [],
       afterCreateStore: [],
       provider: [],
-    }
-  );
+    },
+  });
   expect(Object.values(store.getState())).toEqual([{ todoList: [] }]);
   foo.add('test');
   expect(Object.values(store.getState())).toEqual([{ todoList: ['test'] }]);
@@ -122,13 +122,13 @@ test('base model with `useFactory`', () => {
     },
   });
   const foo = container.get(Foo);
-  const store = createStore(
+  const store = createStore({
     modules,
     container,
     ServiceIdentifiers,
-    new Set(),
-    (...args: any[]) => {},
-    {
+    loadedModules: new Set(),
+    load: (...args: any[]) => {},
+    pluginHooks: {
       middleware: [],
       beforeCombineRootReducers: [],
       afterCombineRootReducers: [],
@@ -136,8 +136,8 @@ test('base model with `useFactory`', () => {
       preloadedStateHandler: [],
       afterCreateStore: [],
       provider: [],
-    }
-  );
+    },
+  });
   expect(store.getState()).toEqual({
     todos: { todoList: ['bar'] },
   });
@@ -194,15 +194,15 @@ test('base model with `useValue` and `enablePatches`', () => {
     },
   });
   const foo = container.get(Foo);
-  const store = createStore(
+  const store = createStore({
     modules,
     container,
     ServiceIdentifiers,
-    new Set(),
-    (...args: any[]) => {
+    loadedModules: new Set(),
+    load: (...args: any[]) => {
       //
     },
-    {
+    pluginHooks: {
       middleware: [],
       beforeCombineRootReducers: [],
       afterCombineRootReducers: [],
@@ -211,11 +211,10 @@ test('base model with `useValue` and `enablePatches`', () => {
       afterCreateStore: [],
       provider: [],
     },
-    undefined,
-    {
+    devOptions: {
       enablePatches: true,
-    }
-  );
+    },
+  });
   const originalTodoState = foo.todo[stateKey]!;
   expect(Object.values(store.getState())).toEqual([{ todoList: [] }]);
   expect(actionFn.mock.calls.length).toBe(0);