@lomray/react-mobx-manager 2.0.0-beta.1 → 2.0.0-beta.10

package/README.md

@@ -37,8 +37,8 @@
   - [Manager](#manager)
   - [withStores](#withstores)
   - [StoreManagerProvider](#storemanagerprovider)
-  - [useStoreManagerContext](#usestoremanagercontext)
-  - [useStoreManagerParentContext](#usestoremanagerparentcontext)
+  - [useStoreManagerContext](#usestoremanager)
+  - [useStoreManagerParentContext](#usestoremanagerparent)
   - [Store](#store)
 - [React Native Debug Plugin](#react-native-debug-plugin)
 - [Bugs and feature requests](#bugs-and-feature-requests)
@@ -253,10 +253,13 @@ const storeManager = new Manager({
      */
     shouldRemoveInitState: true,
     /**
-     * Enable this option if your application support server-side rendering (on both side, client and server)
-     * Default: false
+     * Configure store destroy timers
      */
-    isSSR: false,
+    destroyTimers: {
+      init: 500,
+      touched: 10000, // NOTE: set to max request timeout
+      unused: 1000,
+    },
   }
 });
 
@@ -285,16 +288,11 @@ const store2 = storeManager.getStore(SomeStore, { contextId: 'necessary-context-
  */
 const relations = storeManager.getStoresRelations();
 
-/**
- * Generate unique context id
- */
-const contextId = storeManager.createContextId();
-
 /**
  * Manually create stores for component
  * NOTE: 'withStores' wrapper use this method, probably you won't need it
  */
-const stores = storeManager.createStores(['someStore', MyStore], 'parent-id', 'context-id', 'HomePage');
+const stores = storeManager.createStores(['someStore', MyStore], 'parent-id', 'context-id', 'suspense-id', 'HomePage', { componentProp: 'test' });
 
 /**
  * Mount/Unmount simple stores to component
@@ -338,10 +336,10 @@ const storeClass = Manager.persistStore(class MyStore {}, 'my-store');
 import { withStores } from '@lomray/react-mobx-manager';
 
 /**
- * Create and connect 'stores' to component
+ * Create and connect 'stores' to component with custom context id
  * NOTE: In most cases, you don't need to pass a third argument (contextId). 
  */
-withStores(Component, stores, 'optional-context-id');
+withStores(Component, stores, { customContextId: 'optional-context-id' });
 
 const stores = { myStore: MyStore, anotherStore: AnotherStore };
 ```
@@ -361,27 +359,27 @@ import { StoreManagerProvider } from '@lomray/react-mobx-manager';
 </StoreManagerProvider>
 ```
 
-### useStoreManagerContext
+### useStoreManager
 ```typescript jsx
-import { useStoreManagerContext } from '@lomray/react-mobx-manager';
+import { useStoreManager } from '@lomray/react-mobx-manager';
 
 const MyComponent: FC = () => {
   /**
    * Get store manager inside your function component
    */
-  const storeManager = useStoreManagerContext();
+  const storeManager = useStoreManager();
 }
 ```
 
-### useStoreManagerParentContext
+### useStoreManagerParent
 ```typescript jsx
-import { useStoreManagerParentContext } from '@lomray/react-mobx-manager';
+import { useStoreManagerParent } from '@lomray/react-mobx-manager';
 
 const MyComponent: FC = () => {
   /**
    * Get parent context id
    */
-  const { parentId } = useStoreManagerParentContext();
+  const { parentId } = useStoreManagerParent();
 }
 ```
 
@@ -414,7 +412,7 @@ class MyStore {
   /**
    * @private
    */
-  private someParentStore: ClassReturnType<typeof SomeParentStore>;
+  private readonly someParentStore: ClassReturnType<typeof SomeParentStore>;
 
   /**
    * @constructor
@@ -445,14 +443,6 @@ class MyStore {
     // do something
   }
 
-  /**
-   * Define this method if you want to do something when a component with this store is mount
-   * @private
-   */
-  private onMount(): void {
-    // do something
-  }
-
   /**
    * Define this method if you want to do something when a component with this store is unmount
    * @private
@@ -476,7 +466,6 @@ Lifecycles:
  - constructor
  - wakeup (restore state from persisted store)
  - init
- - onMount
  - onDestroy
 
 ## React Native debug plugin

package/lib/context.d.ts

@@ -1,20 +1,20 @@
 /// <reference types="react" />
+import { IConsistentSuspense } from '@lomray/consistent-suspense';
 import React from 'react';
 import { FC, ReactElement } from "react";
 import Manager from "./manager.js";
+import { TStores } from "./types-9745a837.js";
 interface IStoreManagerProvider {
     storeManager: Manager;
     shouldInit?: boolean;
     fallback?: ReactElement;
     children?: React.ReactNode;
+    suspenseProvider?: Partial<IConsistentSuspense>;
 }
 interface IStoreManagerParentProvider {
-    children?: React.ReactNode;
     parentId: string;
-}
-interface IStoreManagerSuspenseProvider {
     children?: React.ReactNode;
-    id: string | null;
+    initStores?: TStores;
 }
 /**
  * Mobx store manager context
@@ -24,15 +24,6 @@ declare const StoreManagerContext: React.Context<Manager>;
  * To spread relationships
  */
 declare const StoreManagerParentContext: React.Context<string>;
-/**
- * Generate id for suspended component stores
- */
-declare const StoreManagerSuspenseContext: React.Context<string | null>;
-/**
- * Mobx store manager parent provider
- * @constructor
- */
-declare const StoreManagerSuspenseProvider: FC<IStoreManagerSuspenseProvider>;
 /**
  * Mobx store manager parent provider
  * @constructor
@@ -43,7 +34,6 @@ declare const StoreManagerParentProvider: FC<Omit<IStoreManagerParentProvider, '
  * @constructor
  */
 declare const StoreManagerProvider: FC<IStoreManagerProvider>;
-declare const useStoreManagerContext: () => Manager;
-declare const useStoreManagerParentContext: () => IStoreManagerParentProvider['parentId'];
-declare const useStoreManagerSuspenseContext: () => IStoreManagerSuspenseProvider['id'];
-export { StoreManagerContext, StoreManagerParentContext, StoreManagerSuspenseContext, StoreManagerProvider, StoreManagerParentProvider, StoreManagerSuspenseProvider, useStoreManagerContext, useStoreManagerParentContext, useStoreManagerSuspenseContext };
+declare const useStoreManager: () => Manager;
+declare const useStoreManagerParent: () => IStoreManagerParentProvider['parentId'];
+export { StoreManagerContext, StoreManagerParentContext, StoreManagerProvider, StoreManagerParentProvider, useStoreManager, useStoreManagerParent };

package/lib/context.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react");function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var r=t(e);const a=r.default.createContext({}),n=r.default.createContext("root"),o=r.default.createContext(null),s=({children:e,parentId:t})=>r.default.createElement(n.Provider,{value:t,children:e});exports.StoreManagerContext=a,exports.StoreManagerParentContext=n,exports.StoreManagerParentProvider=s,exports.StoreManagerProvider=({children:t,storeManager:n,fallback:o,shouldInit:u=!1})=>{const[l,d]=e.useState(!u);return e.useEffect((()=>{u&&n.init().then((()=>d(!0))).catch((e=>{console.error("Failed initialized store manager: ",e)}))}),[u,n]),r.default.createElement(a.Provider,{value:n},r.default.createElement(s,{parentId:"root"},l?t:o||t))},exports.StoreManagerSuspenseContext=o,exports.StoreManagerSuspenseProvider=({children:e,id:t})=>r.default.createElement(o.Provider,{value:t,children:e}),exports.useStoreManagerContext=()=>e.useContext(a),exports.useStoreManagerParentContext=()=>e.useContext(n),exports.useStoreManagerSuspenseContext=()=>e.useContext(o);
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@lomray/consistent-suspense"),t=require("react");function r(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=r(t);const o=n.default.createContext({}),a=n.default.createContext("root"),s=({parentId:e,children:t,initStores:r})=>{const o=u();return r&&o.touchedStores(r),n.default.createElement(a.Provider,{value:e,children:t})},u=()=>t.useContext(o);exports.StoreManagerContext=o,exports.StoreManagerParentContext=a,exports.StoreManagerParentProvider=s,exports.StoreManagerProvider=({children:r,storeManager:a,fallback:u,suspenseProvider:i={},shouldInit:l=!1})=>{const[d,c]=t.useState(!l);return t.useEffect((()=>{l&&a.init().then((()=>c(!0))).catch((e=>{console.error("Failed initialized store manager: ",e)}))}),[l,a]),n.default.createElement(e.ConsistentSuspenseProvider,{...i},n.default.createElement(o.Provider,{value:a},n.default.createElement(s,{parentId:"root"},d?r:u||r)))},exports.useStoreManager=u,exports.useStoreManagerParent=()=>t.useContext(a);

package/lib/index.d.ts

@@ -1,8 +1,7 @@
-export * from "./types-abd34741.js";
+export * from "./types-9745a837.js";
 export * from "./context.js";
 export { default as Manager } from "./manager.js";
 export { default as onChangeListener } from "./on-change-listener.js";
 export { default as wakeup } from "./wakeup.js";
 export { default as withStores } from "./with-stores.js";
 export { default as Events } from "./events.js";
-export { default as MobxSuspense } from "./mobx-suspense.js";

package/lib/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("./context.js"),r=require("./manager.js"),t=require("./on-change-listener.js"),o=require("./wakeup.js"),n=require("./with-stores.js"),s=require("./events.js"),a=require("./mobx-suspense.js");exports.StoreManagerContext=e.StoreManagerContext,exports.StoreManagerParentContext=e.StoreManagerParentContext,exports.StoreManagerParentProvider=e.StoreManagerParentProvider,exports.StoreManagerProvider=e.StoreManagerProvider,exports.StoreManagerSuspenseContext=e.StoreManagerSuspenseContext,exports.StoreManagerSuspenseProvider=e.StoreManagerSuspenseProvider,exports.useStoreManagerContext=e.useStoreManagerContext,exports.useStoreManagerParentContext=e.useStoreManagerParentContext,exports.useStoreManagerSuspenseContext=e.useStoreManagerSuspenseContext,exports.Manager=r,exports.onChangeListener=t,exports.wakeup=o,exports.withStores=n,exports.Events=s,exports.MobxSuspense=a;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("./context.js"),r=require("./manager.js"),t=require("./on-change-listener.js"),a=require("./wakeup.js"),o=require("./with-stores.js"),n=require("./events.js");exports.StoreManagerContext=e.StoreManagerContext,exports.StoreManagerParentContext=e.StoreManagerParentContext,exports.StoreManagerParentProvider=e.StoreManagerParentProvider,exports.StoreManagerProvider=e.StoreManagerProvider,exports.useStoreManager=e.useStoreManager,exports.useStoreManagerParent=e.useStoreManagerParent,exports.Manager=r,exports.onChangeListener=t,exports.wakeup=a,exports.withStores=o,exports.Events=n;

package/lib/manager.d.ts

@@ -1,4 +1,5 @@
-import { IConstructableStore, IManagerParams, IStorage, IStore, TStoreDefinition, IManagerOptions, TStores, IStoreLifecycle, TInitStore, IStoreParams } from "./types-abd34741.js";
+import StoreStatus from "./store-status.js";
+import { IConstructableStore, IManagerOptions, IManagerParams, IStorage, IStore, IStoreParams, TInitStore, TStoreDefinition, TStores } from "./types-9745a837.js";
 /**
  * Mobx stores manager
  */
@@ -48,6 +49,11 @@ declare class Manager {
      * Manager options
      */
     readonly options: IManagerOptions;
+    /**
+     * Suspense stores relations
+     * @see withStores
+     */
+    protected suspenseRelations: Map<string, Set<string>>;
     /**
      * @constructor
      */
@@ -83,6 +89,13 @@ declare class Manager {
      * Get stores relations
      */
     getStoresRelations(): Manager['storesRelations'];
+    /**
+     * Get suspense relations with stores
+     */
+    /**
+     * Get suspense relations with stores
+     */
+    getSuspenseRelations(): Manager['suspenseRelations'];
     /**
      * Get persisted stores ids
      */
@@ -104,13 +117,6 @@ declare class Manager {
      * @protected
      */
     protected getStoreId<T>(store: IConstructableStore<T> | TInitStore, params?: IStoreParams): string;
-    /**
-     * Generate new context id
-     */
-    /**
-     * Generate new context id
-     */
-    createContextId(id?: string): string;
     /**
      * Get exist store
      */
@@ -142,25 +148,21 @@ declare class Manager {
     /**
      * Create stores for component
      */
-    createStores(map: [string, TStoreDefinition][], parentId: string, contextId: string, componentName: string, componentProps?: Record<string, any>): TStores;
+    createStores(map: [string, TStoreDefinition][], parentId: string, contextId: string, suspenseId: string, componentName: string, componentProps?: Record<string, any>): TStores;
     /**
      * Prepare store before usage
-     * @protected
      */
     /**
      * Prepare store before usage
-     * @protected
      */
     protected prepareStore(store: TStores[string]): void;
     /**
-     * Prepare store before mount to component
-     * @protected
+     * Remove store
      */
     /**
-     * Prepare store before mount to component
-     * @protected
+     * Remove store
      */
-    protected prepareMount(store: TStores[string]): Required<IStoreLifecycle>['onDestroy'][];
+    protected removeStore(store: TStores[string]): void;
     /**
      * Mount stores to component
      */
@@ -168,6 +170,20 @@ declare class Manager {
      * Mount stores to component
      */
     mountStores(stores: TStores): () => void;
+    /**
+     * Change the stores status to touched
+     */
+    /**
+     * Change the stores status to touched
+     */
+    touchedStores(stores: TStores): void;
+    /**
+     * Change store status
+     */
+    /**
+     * Change store status
+     */
+    protected setStoreStatus(store: TStores[string], status: StoreStatus): void;
     /**
      * Get store's state
      */

package/lib/manager.js

@@ -1 +1 @@
-"use strict";var e=require("@lomray/event-manager"),t=require("mobx"),s=require("./events.js"),r=require("./on-change-listener.js"),o=require("./wakeup.js");function i(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=i(e);class a{constructor({initState:e,storesParams:t,storage:s,options:r}={}){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}}),Object.defineProperty(this,"pushInitState",{enumerable:!0,configurable:!0,writable:!0,value:(e={})=>{for(const[t,s]of Object.entries(e))this.initState[t]=s}}),this.initState=e||{},this.storesParams=t||{},this.storage=s,Object.assign(this.options,r||{}),a.instance=this,"undefined"==typeof window||window.mobxManager||(window.mobxManager={pushInit:this.pushInitState})}async init(){return this.storage&&(this.persistData=await this.storage.get()||{}),this}static get(){if(!a.instance)throw new Error("Store manager is not initialized.");return a.instance}getStores(){return this.stores}getStoresRelations(){return this.storesRelations}static getPersistedStoresIds(){return a.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 r,o;const{isSSR:i}=this.options,{id:l,contextId:d,parentId:u,componentName:p,componentProps:c}=t;if((e.isSingleton||i)&&this.stores.has(l))return this.stores.get(l);const h=new e({...this.storesParams,storeManager:this,getStore:(e,t={contextId:d,parentId:u})=>this.getStore(e,t),componentProps:c});h.libStoreId=l,h.isSingleton=e.isSingleton,h.libStoreContextId=e.isSingleton?"singleton":d,h.libStoreParentId=e.isSingleton||!u||u===d?"root":u,h.libStoreComponentName=p;const S=this.initState[l],b=this.persistData[l];return S&&Object.assign(h,S),n.default.publish(s.CREATE_STORE,{store:e}),"wakeup"in h&&a.persistedStores.has(l)&&(null===(r=h.wakeup)||void 0===r||r.call(h,h,{initState:S,persistedState:b})),null===(o=h.init)||void 0===o||o.call(h),this.prepareStore(h),(h.isSingleton||i)&&this.prepareMount(h),h}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 t=e.libStoreId,r=e.libStoreContextId;this.storesRelations.has(r)||this.storesRelations.set(r,{ids:new Set,parentId:e.libStoreParentId&&e.libStoreParentId!==r?e.libStoreParentId:"root",componentName:e.libStoreComponentName});const{ids:o}=this.storesRelations.get(r);this.stores.has(t)||(this.stores.set(t,e),o.add(t),n.default.publish(s.ADD_STORE,{store:e}))}prepareMount(e){const{shouldRemoveInitState:t}=this.options,s=e.libStoreId,r=[];return a.persistedStores.has(s)&&"addOnChangeListener"in e&&r.push(e.addOnChangeListener(e,this)),t&&this.initState[s]&&delete this.initState[s],r}mountStores(e){const t=[];return Object.values(e).forEach((e=>{var r;if(this.prepareStore(e),t.push(...this.prepareMount(e)),n.default.publish(s.MOUNT_STORE,{store:e}),"onMount"in e){const s=null===(r=e.onMount)||void 0===r?void 0:r.call(e);"function"==typeof s&&t.push(s)}"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 r=e.libStoreId;if(n.default.publish(s.UNMOUNT_STORE,{store:e}),!e.isSingleton){const{ids:o}=null!==(t=this.storesRelations.get(e.libStoreContextId))&&void 0!==t?t:{ids:new Set};this.stores.delete(r),o.delete(r),n.default.publish(s.DELETE_STORE,{store:e}),o.size||this.storesRelations.delete(e.libStoreContextId)}}))}}toJSON(e){var t,s,r;const o={},i=null!==(t=null==e?void 0:e.reduce(((e,t)=>(this.stores.has(t)&&e.set(t,this.stores.get(t)),e)),new Map))&&void 0!==t?t:this.stores;for(const[e,t]of i.entries())o[e]=null!==(r=null===(s=t.toJSON)||void 0===s?void 0:s.call(t))&&void 0!==r?r:a.getObservableProps(t);return o}toPersistedJSON(){var e,t;const s={};for(const r of a.persistedStores){const o=this.stores.get(r);o&&(s[r]=null!==(t=null===(e=o.toJSON)||void 0===e?void 0:e.call(o))&&void 0!==t?t:a.getObservableProps(o))}return s}static getObservableProps(e){const s=t.toJS(e);return Object.entries(s).reduce(((s,[r,o])=>({...s,...t.isObservableProp(e,r)?{[r]:o}:{}})),{})}static persistStore(e,t){return a.persistedStores.has(t)?(console.warn(`Duplicate serializable store key: ${t}`),e):(a.persistedStores.add(t),e.libStoreId=t,"wakeup"in e.prototype||(e.prototype.wakeup=o),"addOnChangeListener"in e.prototype||(e.prototype.addOnChangeListener=r),e)}}Object.defineProperty(a,"persistedStores",{enumerable:!0,configurable:!0,writable:!0,value:new Set}),module.exports=a;
+"use strict";var e=require("@lomray/event-manager"),t=require("mobx"),s=require("./events.js"),o=require("./on-change-listener.js"),r=require("./store-status.js"),i=require("./wakeup.js");function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=n(e);class l{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}}),Object.defineProperty(this,"suspenseRelations",{enumerable:!0,configurable:!0,writable:!0,value:new Map}),Object.defineProperty(this,"pushInitState",{enumerable:!0,configurable:!0,writable:!0,value:(e={})=>{for(const[t,s]of Object.entries(e))this.initState[t]=s}}),this.initState=e||{},this.storesParams=t||{},this.storage=s,Object.assign(this.options,o||{}),l.instance=this,"undefined"==typeof window||window.mobxManager||(window.mobxManager={pushInit:this.pushInitState})}async init(){return this.storage&&(this.persistData=await this.storage.get()||{}),this}static get(){if(!l.instance)throw new Error("Store manager is not initialized.");return l.instance}getStores(){return this.stores}getStoresRelations(){return this.storesRelations}getSuspenseRelations(){return this.suspenseRelations}static getPersistedStoresIds(){return l.persistedStores}getStoreId(e,t={}){const{id:s,contextId:o,key:r}=t;if(s)return s;if(e.libStoreId)return e.libStoreId;let i=e.name||e.constructor.name;return e.isSingleton?i:(i=`${i}--${o}`,r?`${i}--${r}`:i)}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",suspenseId:"",componentName:"root-app",componentProps:{}}):this.lookupStore(s,t)}lookupStore(e,t){var s,o;const{contextId:r,parentId:i}=t,n=null===(s=e.split("--"))||void 0===s?void 0:s[0],{ids:a,parentId:l}=null!==(o=this.storesRelations.get(r))&&void 0!==o?o:{ids:new Set,parentId:i},u=[...a].filter((e=>e.startsWith(`${n}--`)));if(1===u.length)return this.stores.get(u[0]);if(u.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){const{id:o,contextId:i,parentId:n,suspenseId:l,componentName:u,componentProps:d}=t;if(this.stores.has(o))return this.stores.get(o);const h=new e({...this.storesParams,storeManager:this,getStore:(e,t={contextId:i,parentId:n})=>this.getStore(e,t),componentProps:d});return h.libStoreId=o,h.isSingleton=e.isSingleton,h.libStoreContextId=e.isSingleton?"singleton":i,h.libStoreParentId=e.isSingleton||!n||n===i?"root":n,h.libStoreSuspenseId=l,h.libStoreComponentName=u,this.setStoreStatus(h,e.isSingleton?r.inUse:r.init),this.prepareStore(h),a.default.publish(s.CREATE_STORE,{store:e}),h}createStores(e,t,s,o,r,i={}){return e.reduce(((e,[n,a])=>{const[l,u]="store"in a?[a.store,a.id]:[a,this.getStoreId(a,{key:n,contextId:s})];return{...e,[n]:this.createStore(l,{id:u,contextId:s,parentId:t,suspenseId:o,componentName:r,componentProps:i})}}),{})}prepareStore(e){var t,o,r;const i=e.libStoreId,n=e.libStoreContextId,u=e.libStoreSuspenseId,d=this.initState[i],h=this.persistData[i];if(this.stores.has(i))return;if(d&&Object.assign(e,d),"wakeup"in e&&l.persistedStores.has(i)&&(null===(t=e.wakeup)||void 0===t||t.call(e,{initState:d,persistedState:h})),l.persistedStores.has(i)&&"addOnChangeListener"in e){const t=null===(o=e.onDestroy)||void 0===o?void 0:o.bind(e),s=e.addOnChangeListener(e,this);e.onDestroy=()=>{null==s||s(),null==t||t()}}null===(r=e.init)||void 0===r||r.call(e),this.storesRelations.has(n)||this.storesRelations.set(n,{ids:new Set,parentId:e.libStoreParentId&&e.libStoreParentId!==n?e.libStoreParentId:"root",componentName:e.libStoreComponentName}),this.suspenseRelations.has(u)||this.suspenseRelations.set(u,new Set);const{ids:c}=this.storesRelations.get(n);this.stores.set(i,e),c.add(i),this.suspenseRelations.get(u).add(i),a.default.publish(s.ADD_STORE,{store:e})}removeStore(e){var t,o,r;const i=e.libStoreId,n=e.libStoreSuspenseId,{ids:l}=null!==(t=this.storesRelations.get(e.libStoreContextId))&&void 0!==t?t:{ids:new Set};this.stores.has(i)&&(this.stores.delete(i),l.delete(i),n&&(null===(o=this.suspenseRelations.get(n))||void 0===o?void 0:o.has(i))&&this.suspenseRelations.get(n).delete(i),l.size||this.storesRelations.delete(e.libStoreContextId),"onDestroy"in e&&(null===(r=e.onDestroy)||void 0===r||r.call(e)),a.default.publish(s.DELETE_STORE,{store:e}))}mountStores(e){const{shouldRemoveInitState:t}=this.options;return Object.values(e).forEach((e=>{const o=e.libStoreId;t&&this.initState[o]&&delete this.initState[o],this.setStoreStatus(e,r.inUse),a.default.publish(s.MOUNT_STORE,{store:e})})),()=>{Object.values(e).forEach((e=>{e.isSingleton||(this.setStoreStatus(e,r.unused),a.default.publish(s.UNMOUNT_STORE,{store:e}))}))}}touchedStores(e){Object.values(e).forEach((e=>{e.libStoreStatus!==r.init||e.isSingleton||this.setStoreStatus(e,r.touched)}))}setStoreStatus(e,t){const{destroyTimers:{init:s=500,touched:o=1e4,unused:i=1e3}={}}=this.options;e.libStoreStatus=t,clearTimeout(e.libDestroyTimer);let n=0;switch(t){case r.init:n=s;break;case r.touched:n=o;break;case r.unused:n=i}n&&(e.libDestroyTimer=setTimeout((()=>this.removeStore(e)),n))}toJSON(e){var t,s,o;const r={},i=null!==(t=null==e?void 0:e.reduce(((e,t)=>(this.stores.has(t)&&e.set(t,this.stores.get(t)),e)),new Map))&&void 0!==t?t:this.stores;for(const[e,t]of i.entries())r[e]=null!==(o=null===(s=t.toJSON)||void 0===s?void 0:s.call(t))&&void 0!==o?o:l.getObservableProps(t);return r}toPersistedJSON(){var e,t;const s={};for(const o of l.persistedStores){const r=this.stores.get(o);r&&(s[o]=null!==(t=null===(e=r.toJSON)||void 0===e?void 0:e.call(r))&&void 0!==t?t:l.getObservableProps(r))}return s}static getObservableProps(e){const s=t.toJS(e);return Object.entries(s).reduce(((s,[o,r])=>({...s,...t.isObservableProp(e,o)?{[o]:r}:{}})),{})}static persistStore(e,t){return l.persistedStores.has(t)?(console.warn(`Duplicate serializable store key: ${t}`),e):(l.persistedStores.add(t),e.libStoreId=t,"wakeup"in e.prototype||(e.prototype.wakeup=i.bind(e)),"addOnChangeListener"in e.prototype||(e.prototype.addOnChangeListener=o),e)}}Object.defineProperty(l,"persistedStores",{enumerable:!0,configurable:!0,writable:!0,value:new Set}),module.exports=l;

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

@@ -1,4 +1,4 @@
-import { IStorePersisted } from "./types-abd34741.js";
+import { IStorePersisted } from "./types-9745a837.js";
 /**
  * Listen persist store changes
  */

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

@@ -1,4 +1,4 @@
-import { IStorage } from "../types-abd34741.js";
+import { IStorage } from "../types-9745a837.js";
 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-abd34741.js";
+import { IStorage } from "../types-9745a837.js";
 /**
  * Local storage for mobx store manager
  */

package/lib/store-status.d.ts

@@ -0,0 +1,7 @@
+declare enum StoreStatus {
+    init = "init",
+    touched = "touched",
+    inUse = "in-use",
+    unused = "unused"
+}
+export { StoreStatus as default };

package/lib/store-status.js

@@ -0,0 +1 @@
+"use strict";var u;!function(u){u.init="init",u.touched="touched",u.inUse="in-use",u.unused="unused"}(u||(u={}));var e=u;module.exports=e;

package/lib/suspense-query.d.ts

@@ -1,4 +1,4 @@
-import { TInitStore } from "./types-abd34741.js";
+import { TInitStore } from "./types-9745a837.js";
 interface IPromise<TReturn> extends Promise<TReturn> {
     status?: 'fulfilled' | 'pending' | 'rejected';
     value?: TReturn;

package/lib/suspense-query.js

@@ -1 +1 @@
-"use strict";var e=require("mobx");class r{constructor(t,{fieldName:i="isSuspenseDone",...s}={}){Object.defineProperty(this,"promise",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"error",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"store",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"params",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"query",{enumerable:!0,configurable:!0,writable:!0,value:e=>{const{fieldName:t}=this.params;if(!this.store[t])return this.promise||(this.promise=e(),this.promise.then((()=>{this.store[t]=!0}),(e=>{this.store[t]=!0,this.error=e}))),r.run(this.promise)}}),this.store=t,this.params={...s,fieldName:i},e.extendObservable(t,{[i]:!1},{[i]:e.observable})}}Object.defineProperty(r,"run",{enumerable:!0,configurable:!0,writable:!0,value:e=>{if(e){switch(e.status){case"fulfilled":return e.value;case"pending":throw e;case"rejected":throw e.reason;default:e.status="pending",e.then((r=>{e.status="fulfilled",e.value=r}),(r=>{e.status="rejected",e.reason=r}))}throw e}}}),module.exports=r;
+"use strict";var e=require("mobx");class r{constructor(t,{fieldName:i="isSuspenseDone",...s}={}){Object.defineProperty(this,"promise",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"error",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"store",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"params",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"query",{enumerable:!0,configurable:!0,writable:!0,value:t=>{const{fieldName:i}=this.params;if(!this.store[i])return this.promise||(this.promise=t(),this.promise.then((()=>{e.runInAction((()=>{this.store[i]=!0}))}),(r=>{e.runInAction((()=>{this.store[i]=!0,this.error=r}))}))),r.run(this.promise)}}),this.store=t,this.params={...s,fieldName:i},e.extendObservable(t,{[i]:!1},{[i]:e.observable})}}Object.defineProperty(r,"run",{enumerable:!0,configurable:!0,writable:!0,value:e=>{if(e){switch(e.status){case"fulfilled":return e.value;case"pending":throw e;case"rejected":throw e.reason;default:e.status="pending",e.then((r=>{e.status="fulfilled",e.value=r}),(r=>{e.status="rejected",e.reason=r}))}throw e}}}),module.exports=r;

package/lib/{types-abd34741.d.ts → types-9745a837.d.ts}

@@ -1,4 +1,6 @@
+/// <reference types="node" />
 import Manager from "./manager.js";
+import StoreStatus from "./store-status.js";
 interface IWindowManager {
     pushInit: (state: Record<string, any>) => void;
 }
@@ -14,13 +16,15 @@ interface IConstructorParams<TProps = Record<string, any>> {
 }
 interface IStoreLifecycle {
     onDestroy?: () => void;
-    onMount?: () => void | (() => void);
 }
 interface IStore extends IStoreLifecycle {
     libStoreId?: string;
     libStoreContextId?: string;
     libStoreParentId?: string;
+    libStoreSuspenseId?: string;
     libStoreComponentName?: string;
+    libStoreStatus?: StoreStatus;
+    libDestroyTimer?: NodeJS.Timeout;
     isSingleton?: boolean;
     init?: () => void;
     toJSON?: () => Record<string, any>;
@@ -47,7 +51,7 @@ interface IManagerParams {
     options?: IManagerOptions;
     initState?: Record<string, any>;
 }
-type TWakeup = (store: IStore, state: {
+type TWakeup = (state: {
     initState?: Record<string, any>;
     persistedState?: Record<string, any>;
 }) => void;
@@ -59,7 +63,11 @@ interface IStorage {
 interface IManagerOptions {
     shouldDisablePersist?: boolean;
     shouldRemoveInitState?: boolean;
-    isSSR?: boolean;
+    destroyTimers?: {
+        init?: number;
+        touched?: number;
+        unused?: number;
+    };
 }
 type TStores = {
     [storeKey: string]: IStore | IStorePersisted;
@@ -81,6 +89,7 @@ interface IStoreParams {
     key?: string;
     contextId?: string;
     parentId?: string;
+    suspenseId?: string;
     componentName?: string;
     componentProps?: Record<string, any>;
 }

package/lib/wakeup.d.ts

@@ -1,6 +1,6 @@
-import { IStorePersisted } from "./types-abd34741.js";
+import { TStores, TWakeup } from "./types-9745a837.js";
 /**
- * Restore store state from initial state
+ * Restore persisted store state
  */
-declare const wakeup: IStorePersisted['wakeup'];
+declare function wakeup(this: TStores[string], { persistedState }: Parameters<TWakeup>[0]): void;
 export { wakeup as default };

package/lib/wakeup.js

@@ -1 +1 @@
-"use strict";module.exports=(e,{persistedState:s})=>{s&&Object.assign(e,s)};
+"use strict";module.exports=function({persistedState:t}){t&&Object.assign(this,t)};

package/lib/with-stores.d.ts

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { TMapStores, IWithStoreOptions } from "./types-abd34741.js";
+import { TMapStores, IWithStoreOptions } from "./types-9745a837.js";
 /**
  * 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"),n=require("./context.js");function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var o=a(e),u=a(r);module.exports=(e,a,{customContextId:s}={})=>{const d=t.observer(e),i=s||e.libStoreContextId,c=e.displayName||e.name,l=e=>{var t;const o=n.useStoreManagerContext(),s=n.useStoreManagerParentContext(),l=n.useStoreManagerSuspenseContext(),S=null===(t=u.default.useId)||void 0===t?void 0:t.call(u.default),[{contextId:f,initStores:x}]=r.useState((()=>{const t=o.createContextId(i||l||S);return{contextId:t,initStores:o.createStores(Object.entries(a),s,t,c,e)}}));return r.useEffect((()=>o.mountStores(x)),[x,o]),u.default.createElement(n.StoreManagerSuspenseProvider,{id:null},u.default.createElement(n.StoreManagerParentProvider,{parentId:f},u.default.createElement(d,{...x,...e})))};return o.default(l,e),l.displayName=`Mobx(${c})`,l};
+"use strict";var e=require("@lomray/consistent-suspense"),t=require("hoist-non-react-statics"),r=require("mobx-react-lite"),n=require("react"),s=require("./context.js");function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=o(t),u=o(n);module.exports=(t,o,{customContextId:i}={})=>{const c=r.observer(t),d=i||t.libStoreContextId,l=t.displayName||t.name,m=t=>{const r=s.useStoreManager(),a=s.useStoreManagerParent(),{suspenseId:i}=e.useConsistentSuspense(),m=e.useId(),[{contextId:S,initStores:f,mountStores:p}]=n.useState((()=>{const e=d||m;return{contextId:e,initStores:r.createStores(Object.entries(o),a,e,i,l,t),mountStores:()=>r.mountStores(f)}}));return n.useEffect(p,[p]),u.default.createElement(s.StoreManagerParentProvider,{parentId:S,initStores:f},u.default.createElement(c,{...t,...f}))};return a.default(m,t),m.displayName=`Mobx(${l})`,Object.defineProperty(m,"name",{value:m.displayName,writable:!1,enumerable:!1})};

package/package.json

@@ -1,9 +1,21 @@
 {
   "name": "@lomray/react-mobx-manager",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.10",
   "description": "This package provides Mobx stores manager for react.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
+  "exports": {
+    ".": "./lib/index.js",
+    "./*": "./lib/*.js"
+  },
+  "typesVersions": {
+    "*": {
+      "./*": [
+        "lib/*",
+        "lib/storages/*"
+      ]
+    }
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/Lomray-Software/react-mobx-manager"
@@ -39,15 +51,15 @@
     "prepare": "husky install"
   },
   "dependencies": {
+    "@lomray/consistent-suspense": "^1.2.2",
     "@lomray/event-manager": "^1.2.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.3",
-    "@commitlint/config-conventional": "^17.6.3",
+    "@commitlint/cli": "^17.6.6",
+    "@commitlint/config-conventional": "^17.6.6",
     "@lomray/eslint-config-react": "^3.0.0",
     "@lomray/prettier-config": "^1.2.0",
     "@rollup/plugin-terser": "^0.4.3",
-    "@types/express": "^4.17.17",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/react": "^18.2.7",
     "eslint": "^8.41.0",

package/.nvmrc

@@ -1 +0,0 @@
-18.13.0

package/lib/mobx-suspense.d.ts

@@ -1,8 +0,0 @@
-import { FC, SuspenseProps } from 'react';
-/**
- * Wrapper around react suspense
- * Create unique id for each suspense (used for create/stream stores state)
- * @constructor
- */
-declare const MobxSuspense: FC<SuspenseProps>;
-export { MobxSuspense as default };

package/lib/mobx-suspense.js

@@ -1 +0,0 @@
-"use strict";var e=require("react"),t=require("./context.js");function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var r=a(e);module.exports=({children:a,fallback:l,...n})=>{var u;const d=e.useId(),c=e.Children.map(a,((e,a)=>r.default.createElement(t.StoreManagerSuspenseProvider,{id:`${d}${a}`},e))),i=r.default.createElement(r.default.Fragment,null,r.default.createElement("script",{"data-context-id":d,"data-count":null!==(u=null==c?void 0:c.length)&&void 0!==u?u:0}),l);return r.default.createElement(e.Suspense,{...n,children:c,fallback:i})};

package/lib/stream-stores.d.ts

@@ -1,72 +0,0 @@
-import { Response } from 'express';
-import Manager from "./manager.js";
-/**
- * Stream mobx manager stores
- * NOTE: use with renderToPipeableStream
- */
-declare class StreamStores {
-    /**
-     * Obtained suspensions from application shell
-     * @protected
-     */
-    protected suspendIds: Record<string, {
-        contextId: string;
-        count: number;
-    }>;
-    /**
-     * Mobx store manager instance
-     * @protected
-     */
-    protected readonly manager: Manager;
-    /**
-     * @constructor
-     * @protected
-     */
-    /**
-     * @constructor
-     * @protected
-     */
-    protected constructor(manager: Manager);
-    /**
-     * Listen react stream and push suspense stores state to client
-     */
-    /**
-     * Listen react stream and push suspense stores state to client
-     */
-    static stream(res: Response, manager: Manager): StreamStores;
-    /**
-     * Begin listen stream
-     */
-    /**
-     * Begin listen stream
-     */
-    protected beginStream(res: Response): void;
-    /**
-     * Parse suspensions and related stores context id from application shell
-     * @protected
-     */
-    /**
-     * Parse suspensions and related stores context id from application shell
-     * @protected
-     */
-    protected obtainSuspensions(html: string): void;
-    /**
-     * Replace suspend id
-     * @protected
-     */
-    /**
-     * Replace suspend id
-     * @protected
-     */
-    protected replaceSuspendIds(formId: string, toId: string): string | undefined;
-    /**
-     * Parse complete suspense chunk
-     * @protected
-     */
-    /**
-     * Parse complete suspense chunk
-     * @protected
-     */
-    protected obtainCompleteSuspense(html: string): Uint8Array | undefined;
-}
-export { StreamStores as default };

package/lib/stream-stores.js

@@ -1 +0,0 @@
-"use strict";class t{constructor(t){Object.defineProperty(this,"suspendIds",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.defineProperty(this,"manager",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),this.manager=t}static stream(e,s){const n=new t(s);return n.beginStream(e),n}beginStream(t){const e=t.write.bind(t);t.write=(t,...s)=>{const n=Buffer.from(t).toString();this.obtainSuspensions(n);const r=this.obtainCompleteSuspense(n);return r?e(Buffer.concat([r,t]),...s):e(t,...s)}}obtainSuspensions(t){if(this.suspendIds)return;const e=[...t.matchAll(/<template id="(?<templateId>[^"]+)".+?<script data-context-id="(?<contextId>[^"]+)".+?data-count="(?<count>[^"]+)">/g)];e.length&&(this.suspendIds=e.reduce(((t,{groups:e})=>{const{templateId:s,contextId:n,count:r}=null!=e?e:{};return s?{...t,[s]:{contextId:n,count:Number(r)}}:t}),{}))}replaceSuspendIds(t,e){if(t)return this.suspendIds[e]=this.suspendIds[t],delete this.suspendIds[t],e}obtainCompleteSuspense(t){var e,s,n;if(!t.startsWith("<div hidden id="))return;const{from:r,to:i}=null!==(s=null===(e=t.match(/\$RC\("(?<from>[^"]+)","(?<to>[^"]+)"\)/))||void 0===e?void 0:e.groups)&&void 0!==s?s:{},o=this.replaceSuspendIds(r,i);if(!o)return;const{contextId:u,count:d}=null!==(n=this.suspendIds[o])&&void 0!==n?n:{};if(!u||!d)return;const a=this.manager.getStoresRelations(),c=this.manager.createContextId(u),l=[...Array(d)].reduce(((t,e,s)=>{const n=`${c}${s}`;return a.has(n)&&t.push(...a.get(n).ids),t}),[]);if(!l.length)return;const p=JSON.stringify(this.manager.toJSON(l));return Buffer.from(`<script>window.mobxManager.pushInit(${p});<\/script>`,"utf8")}}module.exports=t;

package/tsconfig.checks.json

@@ -1,6 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": [
-    "src/**/*"
-  ]
-}