@lomray/react-mobx-manager 1.3.1-beta.2 → 1.4.0-beta.1

package/README.md

@@ -422,9 +422,12 @@ class MyStore {
    * storeManager - access to store manager
    * apiClient - your custom param, see 'storesParams' in Manager
    */
-  constructor({ getStore, storeManager, apiClient }: IConstructorParams) {
+  constructor({ getStore, storeManager, apiClient, componentProps }: IConstructorParams) {
     this.apiClient = apiClient;
     this.someParentStore = getStore(SomeParentStore);
+    
+    // In case when store is't singletone you can get access to component props
+    console.log(componentProps);
 
     makeObservable(this, {
       state: observable,

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./types-4e5aab57";
+export * from "./types-c6a5e53a";
 export * from "./context";
 export { default as Manager } from "./manager";
 export { default as onChangeListener } from "./on-change-listener";

package/lib/manager.d.ts

@@ -1,4 +1,4 @@
-import { IConstructableStore, IManagerParams, IStorage, IStore, TStoreDefinition, IManagerOptions, TStores, IStoreLifecycle, TInitStore, IStoreParams } from "./types-4e5aab57";
+import { IConstructableStore, IManagerParams, IStorage, IStore, TStoreDefinition, IManagerOptions, TStores, IStoreLifecycle, TInitStore, IStoreParams } from "./types-c6a5e53a";
 /**
  * Mobx stores manager
  */
@@ -137,7 +137,7 @@ declare class Manager {
     /**
      * Create stores for component
      */
-    createStores(map: [string, TStoreDefinition][], parentId: string, contextId: string, componentName: string): TStores;
+    createStores(map: [string, TStoreDefinition][], parentId: string, contextId: string, componentName: string, componentProps?: Record<string, any>): TStores;
     /**
      * Prepare store before usage
      * @protected

package/lib/manager.js

@@ -1 +1 @@
-"use strict";var e=require("mobx"),t=require("./on-change-listener.js"),s=require("./wakeup.js");class r{constructor({initState:e,storesParams:t,storage:s,options:o}={}){Object.defineProperty(this,"stores",{enumerable:!0,configurable:!0,writable:!0,value:new Map}),Object.defineProperty(this,"storesRelations",{enumerable:!0,configurable:!0,writable:!0,value:new Map}),Object.defineProperty(this,"initState",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"storage",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"persistData",{enumerable:!0,configurable:!0,writable:!0,value:{}}),Object.defineProperty(this,"storesParams",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"options",{enumerable:!0,configurable:!0,writable:!0,value:{shouldDisablePersist:!1,shouldRemoveInitState:!0,isSSR:!1}}),this.initState=e||{},this.storesParams=t||{},this.storage=s,Object.assign(this.options,o||{}),r.instance=this}async init(){return this.storage&&(this.persistData=await this.storage.get()||{}),this}static get(){if(!r.instance)throw new Error("Store manager is not initialized.");return r.instance}getStores(){return this.stores}getStoresRelations(){return this.storesRelations}static getPersistedStoresIds(){return r.persistedStores}getStoreId(e,t={}){const{id:s,contextId:r,key:o}=t;if(s)return s;if(e.libStoreId)return e.libStoreId;let i=e.name||e.constructor.name;return e.isSingleton?i:(i=`${i}--${r}`,o?`${i}--${o}`:i)}createContextId(e){return`ctx${e||this.storesRelations.size+1}`}getStore(e,t={}){const s=this.getStoreId(e,t);return this.stores.has(s)?this.stores.get(s):e.isSingleton?this.createStore(e,{id:s,contextId:"singleton",parentId:"root",componentName:""}):this.lookupStore(s,t)}lookupStore(e,t){var s,r;const{contextId:o,parentId:i}=t,n=null===(s=e.split("--"))||void 0===s?void 0:s[0],{ids:a,parentId:l}=null!==(r=this.storesRelations.get(o))&&void 0!==r?r:{ids:new Set,parentId:i},d=[...a].filter((e=>e.startsWith(`${n}--`)));if(1===d.length)return this.stores.get(d[0]);if(d.length>1)console.error("Parent context has multiple stores with the same id, please pass key to getStore function.");else if(l&&"root"!==l)return this.lookupStore(e,{contextId:l})}createStore(e,t){var s,o;const{isSSR:i}=this.options,{id:n,contextId:a,parentId:l,componentName:d}=t;if((e.isSingleton||i)&&this.stores.has(n))return this.stores.get(n);const u=new e({storeManager:this,getStore:(e,t={contextId:a,parentId:l})=>this.getStore(e,t),...this.storesParams});u.libStoreId=n,u.isSingleton=e.isSingleton,u.libStoreContextId=e.isSingleton?"singleton":a,u.libStoreParentId=e.isSingleton||!l||l===a?"root":l,u.libStoreComponentName=d;const c=this.initState[n],h=this.persistData[n];return c&&Object.assign(u,c),"wakeup"in u&&r.persistedStores.has(n)&&(null===(s=u.wakeup)||void 0===s||s.call(u,u,{initState:c,persistedState:h})),null===(o=u.init)||void 0===o||o.call(u),(u.isSingleton||i)&&this.prepareStore(u),u}createStores(e,t,s,r){return e.reduce(((e,[o,i])=>{const[n,a]="store"in i?[i.store,i.id]:[i,this.getStoreId(i,{key:o,contextId:s})];return{...e,[o]:this.createStore(n,{id:a,contextId:s,parentId:t,componentName:r})}}),{})}prepareStore(e){const{shouldRemoveInitState:t}=this.options,s=e.libStoreId,o=e.libStoreContextId,i=[];this.storesRelations.has(o)||this.storesRelations.set(o,{ids:new Set,parentId:e.libStoreParentId&&e.libStoreParentId!==o?e.libStoreParentId:"root",componentName:e.libStoreComponentName});const{ids:n}=this.storesRelations.get(o);return r.persistedStores.has(s)&&"addOnChangeListener"in e&&i.push(e.addOnChangeListener(e,this)),t&&this.initState[s]&&delete this.initState[s],this.stores.has(s)||(this.stores.set(s,e),n.add(s)),i}mountStores(e){const t=[];return Object.values(e).forEach((e=>{var s;if(t.push(...this.prepareStore(e)),"onMount"in e){const r=null===(s=e.onMount)||void 0===s?void 0:s.call(e);"function"==typeof r&&t.push(r)}"onDestroy"in e&&t.push((()=>{var t;return null===(t=e.onDestroy)||void 0===t?void 0:t.call(e)}))})),()=>{t.forEach((e=>e())),Object.values(e).forEach((e=>{var t;const s=e.libStoreId;if(!e.isSingleton){const{ids:r}=null!==(t=this.storesRelations.get(e.libStoreContextId))&&void 0!==t?t:{ids:new Set};this.stores.delete(s),r.delete(s),r.size||this.storesRelations.delete(e.libStoreContextId)}}))}}toJSON(){var e,t;const s={};for(const[o,i]of this.stores.entries())s[o]=null!==(t=null===(e=i.toJSON)||void 0===e?void 0:e.call(i))&&void 0!==t?t:r.getObservableProps(i);return s}toPersistedJSON(){var e,t;const s={};for(const o of r.persistedStores){const i=this.stores.get(o);i&&(s[o]=null!==(t=null===(e=i.toJSON)||void 0===e?void 0:e.call(i))&&void 0!==t?t:r.getObservableProps(i))}return s}static getObservableProps(t){const s=e.toJS(t);return Object.entries(s).reduce(((s,[r,o])=>({...s,...e.isObservableProp(t,r)?{[r]:o}:{}})),{})}static persistStore(e,o){return r.persistedStores.has(o)?(console.error(`Duplicate serializable store key: ${o}`),e):(r.persistedStores.add(o),e.libStoreId=o,"wakeup"in e.prototype||(e.prototype.wakeup=s),"addOnChangeListener"in e.prototype||(e.prototype.addOnChangeListener=t),e)}}Object.defineProperty(r,"persistedStores",{enumerable:!0,configurable:!0,writable:!0,value:new Set}),module.exports=r;
+"use strict";var e=require("mobx"),t=require("./on-change-listener.js"),s=require("./wakeup.js");class r{constructor({initState:e,storesParams:t,storage:s,options:o}={}){Object.defineProperty(this,"stores",{enumerable:!0,configurable:!0,writable:!0,value:new Map}),Object.defineProperty(this,"storesRelations",{enumerable:!0,configurable:!0,writable:!0,value:new Map}),Object.defineProperty(this,"initState",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"storage",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"persistData",{enumerable:!0,configurable:!0,writable:!0,value:{}}),Object.defineProperty(this,"storesParams",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"options",{enumerable:!0,configurable:!0,writable:!0,value:{shouldDisablePersist:!1,shouldRemoveInitState:!0,isSSR:!1}}),this.initState=e||{},this.storesParams=t||{},this.storage=s,Object.assign(this.options,o||{}),r.instance=this}async init(){return this.storage&&(this.persistData=await this.storage.get()||{}),this}static get(){if(!r.instance)throw new Error("Store manager is not initialized.");return r.instance}getStores(){return this.stores}getStoresRelations(){return this.storesRelations}static getPersistedStoresIds(){return r.persistedStores}getStoreId(e,t={}){const{id:s,contextId:r,key:o}=t;if(s)return s;if(e.libStoreId)return e.libStoreId;let i=e.name||e.constructor.name;return e.isSingleton?i:(i=`${i}--${r}`,o?`${i}--${o}`:i)}createContextId(e){return`ctx${e||this.storesRelations.size+1}`}getStore(e,t={}){const s=this.getStoreId(e,t);return this.stores.has(s)?this.stores.get(s):e.isSingleton?this.createStore(e,{id:s,contextId:"singleton",parentId:"root",componentName:"root-app",componentProps:{}}):this.lookupStore(s,t)}lookupStore(e,t){var s,r;const{contextId:o,parentId:i}=t,n=null===(s=e.split("--"))||void 0===s?void 0:s[0],{ids:a,parentId:l}=null!==(r=this.storesRelations.get(o))&&void 0!==r?r:{ids:new Set,parentId:i},d=[...a].filter((e=>e.startsWith(`${n}--`)));if(1===d.length)return this.stores.get(d[0]);if(d.length>1)console.error("Parent context has multiple stores with the same id, please pass key to getStore function.");else if(l&&"root"!==l)return this.lookupStore(e,{contextId:l})}createStore(e,t){var s,o;const{isSSR:i}=this.options,{id:n,contextId:a,parentId:l,componentName:d,componentProps:c}=t;if((e.isSingleton||i)&&this.stores.has(n))return this.stores.get(n);const u=new e({...this.storesParams,storeManager:this,getStore:(e,t={contextId:a,parentId:l})=>this.getStore(e,t),componentProps:c});u.libStoreId=n,u.isSingleton=e.isSingleton,u.libStoreContextId=e.isSingleton?"singleton":a,u.libStoreParentId=e.isSingleton||!l||l===a?"root":l,u.libStoreComponentName=d;const p=this.initState[n],h=this.persistData[n];return p&&Object.assign(u,p),"wakeup"in u&&r.persistedStores.has(n)&&(null===(s=u.wakeup)||void 0===s||s.call(u,u,{initState:p,persistedState:h})),null===(o=u.init)||void 0===o||o.call(u),(u.isSingleton||i)&&this.prepareStore(u),u}createStores(e,t,s,r,o={}){return e.reduce(((e,[i,n])=>{const[a,l]="store"in n?[n.store,n.id]:[n,this.getStoreId(n,{key:i,contextId:s})];return{...e,[i]:this.createStore(a,{id:l,contextId:s,parentId:t,componentName:r,componentProps:o})}}),{})}prepareStore(e){const{shouldRemoveInitState:t}=this.options,s=e.libStoreId,o=e.libStoreContextId,i=[];this.storesRelations.has(o)||this.storesRelations.set(o,{ids:new Set,parentId:e.libStoreParentId&&e.libStoreParentId!==o?e.libStoreParentId:"root",componentName:e.libStoreComponentName});const{ids:n}=this.storesRelations.get(o);return r.persistedStores.has(s)&&"addOnChangeListener"in e&&i.push(e.addOnChangeListener(e,this)),t&&this.initState[s]&&delete this.initState[s],this.stores.has(s)||(this.stores.set(s,e),n.add(s)),i}mountStores(e){const t=[];return Object.values(e).forEach((e=>{var s;if(t.push(...this.prepareStore(e)),"onMount"in e){const r=null===(s=e.onMount)||void 0===s?void 0:s.call(e);"function"==typeof r&&t.push(r)}"onDestroy"in e&&t.push((()=>{var t;return null===(t=e.onDestroy)||void 0===t?void 0:t.call(e)}))})),()=>{t.forEach((e=>e())),Object.values(e).forEach((e=>{var t;const s=e.libStoreId;if(!e.isSingleton){const{ids:r}=null!==(t=this.storesRelations.get(e.libStoreContextId))&&void 0!==t?t:{ids:new Set};this.stores.delete(s),r.delete(s),r.size||this.storesRelations.delete(e.libStoreContextId)}}))}}toJSON(){var e,t;const s={};for(const[o,i]of this.stores.entries())s[o]=null!==(t=null===(e=i.toJSON)||void 0===e?void 0:e.call(i))&&void 0!==t?t:r.getObservableProps(i);return s}toPersistedJSON(){var e,t;const s={};for(const o of r.persistedStores){const i=this.stores.get(o);i&&(s[o]=null!==(t=null===(e=i.toJSON)||void 0===e?void 0:e.call(i))&&void 0!==t?t:r.getObservableProps(i))}return s}static getObservableProps(t){const s=e.toJS(t);return Object.entries(s).reduce(((s,[r,o])=>({...s,...e.isObservableProp(t,r)?{[r]:o}:{}})),{})}static persistStore(e,o){return r.persistedStores.has(o)?(console.error(`Duplicate serializable store key: ${o}`),e):(r.persistedStores.add(o),e.libStoreId=o,"wakeup"in e.prototype||(e.prototype.wakeup=s),"addOnChangeListener"in e.prototype||(e.prototype.addOnChangeListener=t),e)}}Object.defineProperty(r,"persistedStores",{enumerable:!0,configurable:!0,writable:!0,value:new Set}),module.exports=r;

package/lib/on-change-listener.d.ts

@@ -1,4 +1,4 @@
-import { IStorePersisted } from "./types-4e5aab57";
+import { IStorePersisted } from "./types-c6a5e53a";
 /**
  * Listen persist store changes
  */

package/lib/storages/async-storage.d.ts

@@ -1,4 +1,4 @@
-import { IStorage } from "../types-4e5aab57";
+import { IStorage } from "../types-c6a5e53a";
 interface IAsyncStorage {
     getItem: (key: string) => Promise<string | null>;
     setItem: (key: string, value: string) => Promise<void>;

package/lib/storages/local-storage.d.ts

@@ -1,4 +1,4 @@
-import { IStorage } from "../types-4e5aab57";
+import { IStorage } from "../types-c6a5e53a";
 /**
  * Local storage for mobx store manager
  */

package/lib/{types-4e5aab57.d.ts → types-c6a5e53a.d.ts}

@@ -1,7 +1,8 @@
 import Manager from "./manager";
-interface IConstructorParams {
+interface IConstructorParams<TProps = Record<string, any>> {
     storeManager: Manager;
     getStore: <T>(store: IConstructableStore<T>, params?: Partial<IStoreParams>) => T | undefined;
+    componentProps: TProps;
 }
 interface IStoreLifecycle {
     onDestroy?: () => void;
@@ -33,7 +34,7 @@ type TStoreDefinition<TSto extends IStore | IStorePersisted = any> = IConstructa
 } & IStoreConfig);
 type TMapStores = Record<string, TStoreDefinition>;
 interface IManagerParams {
-    storesParams?: Omit<IConstructorParams, 'storeManager' | 'getStore'>;
+    storesParams?: Omit<IConstructorParams, 'storeManager' | 'getStore' | 'componentProps'>;
     storage?: IStorage;
     options?: IManagerOptions;
     initState?: Record<string, any>;
@@ -73,5 +74,6 @@ interface IStoreParams {
     contextId?: string;
     parentId?: string;
     componentName?: string;
+    componentProps?: Record<string, any>;
 }
 export { IConstructorParams, IStoreLifecycle, IStore, IStorePersisted, TInitStore, IConstructableStore, IStoreConfig, TStoreDefinition, TMapStores, IManagerParams, TWakeup, IStorage, IManagerOptions, TStores, ClassReturnType, StoresType, IStoreParams };

package/lib/wakeup.d.ts

@@ -1,4 +1,4 @@
-import { IStorePersisted } from "./types-4e5aab57";
+import { IStorePersisted } from "./types-c6a5e53a";
 /**
  * Restore store state from initial state
  */

package/lib/with-stores.d.ts

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { TMapStores } from "./types-4e5aab57";
+import { TMapStores } from "./types-c6a5e53a";
 /**
  * Make component observable and pass stores as props
  */

package/lib/with-stores.js

@@ -1 +1 @@
-"use strict";var e=require("hoist-non-react-statics"),t=require("mobx-react-lite"),r=require("react"),a=require("./context.js");function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var o=n(e),u=n(r);module.exports=(e,n,s)=>{const i=t.observer(e),c=s||e.libStoreContextId,d=e.displayName||e.name,l=({...e})=>{var t;const o=a.useStoreManagerContext(),{parentId:s}=a.useStoreManagerParentContext(),l=null===(t=u.default.useId)||void 0===t?void 0:t.call(u.default),[{contextId:f,initStores:x}]=r.useState((()=>{const e=o.createContextId(c||l);return{contextId:e,initStores:o.createStores(Object.entries(n),s,e,d)}}));return r.useEffect((()=>o.mountStores(x)),[x,o]),u.default.createElement(a.StoreManagerParentProvider,{parentId:f},u.default.createElement(i,{...x,...e}))};return o.default(l,e),l.displayName=`Mobx(${d})`,l};
+"use strict";var e=require("hoist-non-react-statics"),t=require("mobx-react-lite"),r=require("react"),a=require("./context.js");function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var o=n(e),u=n(r);module.exports=(e,n,s)=>{const i=t.observer(e),c=s||e.libStoreContextId,d=e.displayName||e.name,l=({...e})=>{var t;const o=a.useStoreManagerContext(),{parentId:s}=a.useStoreManagerParentContext(),l=null===(t=u.default.useId)||void 0===t?void 0:t.call(u.default),[{contextId:f,initStores:x}]=r.useState((()=>{const t=o.createContextId(c||l);return{contextId:t,initStores:o.createStores(Object.entries(n),s,t,d,e)}}));return r.useEffect((()=>o.mountStores(x)),[x,o]),u.default.createElement(a.StoreManagerParentProvider,{parentId:f},u.default.createElement(i,{...x,...e}))};return o.default(l,e),l.displayName=`Mobx(${d})`,l};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lomray/react-mobx-manager",
-  "version": "1.3.1-beta.2",
+  "version": "1.4.0-beta.1",
   "description": "This package provides Mobx stores manager for react.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",