@lomray/react-mobx-manager 1.0.0-beta.5 → 1.0.0-beta.7

package/README.md

@@ -25,7 +25,7 @@
 The React-mobx-manager package is distributed using [npm](https://www.npmjs.com/), the node package manager.
 
 ```
-npm i --save-dev @lomray/react-mobx-manager
+npm i --save @lomray/react-mobx-manager
 ```
 
 Import `Manager, StoreManagerProvider` from `@lomray/react-mobx-manager` into your index file after wrap `<App/>` with `<StoreManagerProvider/>`
@@ -54,9 +54,42 @@ Connect mobx store to manager and you're good to go!
 
 ```jsx
 import { withStores } from '@lomray/react-mobx-manager';
-import stores from './index.stores';
-import User from './index';
-
+import { makeAutoObservable } from 'mobx';
+
+/**
+ * Mobx user store
+ */
+class UserStore {
+  name = 'Matthew'
+
+  constructor() {
+    makeAutoObservable()
+  }
+}
+
+/**
+ * Define stores for component
+ */
+const stores = {
+  userStore: UserStore
+};
+
+type TProps = StoresType <typeof stores>;
+
+/**
+ * User component
+ * @returns {JSX.Element}
+ * @constructor
+ */
+const User: FC<TProps> = ({userStore: {name}}) => {
+  return (
+    <div>{name}</div>
+  )
+}
+
+/**
+ * Connect stores to component
+ */
 export default withStores(User, stores);
 ```
 

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./types-f2f6b0e4";
+export * from "./types-4732bbd2";
 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, TInitStore } from "./types-f2f6b0e4";
+import { IConstructableStore, IManagerParams, IStorage, IStore, TStoreDefinition, IManagerOptions, TStores, TInitStore } from "./types-4732bbd2";
 /**
  * Mobx stores manager
  */
@@ -11,6 +11,11 @@ declare class Manager {
      * Created stores
      */
     private readonly stores;
+    /**
+     * Counters for multiple stores
+     * @private
+     */
+    private readonly counterStores;
     /**
      * Save persisted stores identities
      * @private
@@ -57,11 +62,9 @@ declare class Manager {
     init(): Promise<Manager>;
     /**
      * Get manager instance
-     * NOTE: Need call 'init' before call this method
      */
     /**
      * Get manager instance
-     * NOTE: Need call 'init' before call this method
      */
     static get(): Manager;
     /**
@@ -72,14 +75,14 @@ declare class Manager {
      * Get store identity
      * @protected
      */
-    protected static getStoreKey<T>(store: IConstructableStore<T> | TInitStore, id?: string): string;
+    protected static getStoreKey<T>(store: IConstructableStore<T> | TInitStore, id?: string, index?: number): string;
     /**
      * Get exist store
      */
     /**
      * Get exist store
      */
-    getStore<T>(store: IConstructableStore<T>, id?: string): T | undefined;
+    getStore<T>(store: IConstructableStore<T>, id?: string, index?: number): T | undefined;
     /**
      * Create new store instance
      * @protected

package/lib/manager.js

@@ -1 +1 @@
-"use strict";var e=require("mobx"),t=require("./on-change-listener.js"),r=require("./wakeup.js");class s{constructor({initState:e,storesParams:t,storage:r,options:i}={}){Object.defineProperty(this,"stores",{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}}),this.initState=e||{},this.storesParams=t||{},this.storage=r,Object.assign(this.options,i||{}),s.instance=this}async init(){return this.storage&&(this.persistData=await this.storage.get()||{}),this}static get(){if(!s.instance)throw new Error("Store manager is not initialized.");return s.instance}static getStoreKey(e,t){return t||e.id||e.name||e.constructor.name}getStore(e,t){const r=s.getStoreKey(e,t);return this.stores.has(r)?this.stores.get(r):e.isSingleton?this.createStore(e,t):void 0}createStore(e,t){var r,i,o;const n=s.getStoreKey(e,t),a=this.stores.get(n);if(a)return a;const l=new e({storeManager:this,...this.storesParams});l.id=n,l.isSingleton=e.isSingleton;const u=this.initState[n],c=this.persistData[n];return u&&(Object.assign(l,u),this.options.shouldRemoveInitState&&delete this.initState[n]),"wakeup"in l&&s.persistedStores.has(n)&&(null===(r=l.wakeup)||void 0===r||r.call(l,l,{initState:u,persistedState:c}),null===(i=l.addOnChangeListener)||void 0===i||i.call(l,l,this)),this.stores.set(n,l),null===(o=l.init)||void 0===o||o.call(l),l}createStores(e){return e.reduce(((e,[t,r])=>{const[s,i]="store"in r?[r.store,r.id]:[r];return{...e,[t]:this.createStore(s,i)}}),{})}mountStores(e){const t=[];return Object.values(e).forEach((e=>{var r;if("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=>{const t=s.getStoreKey(e);e.isSingleton||this.stores.delete(t)}))}}toJSON(){var e,t;const r={};for(const[i,o]of this.stores.entries())r[i]=null!==(t=null===(e=o.toJSON)||void 0===e?void 0:e.call(o))&&void 0!==t?t:s.getObservableProps(o);return r}toPersistedJSON(){var e,t;const r={};for(const i of s.persistedStores){const o=this.stores.get(i);o&&(r[i]=null!==(t=null===(e=o.toJSON)||void 0===e?void 0:e.call(o))&&void 0!==t?t:s.getObservableProps(o))}return r}static getObservableProps(t){const r=e.toJS(t);return Object.entries(r).reduce(((r,[s,i])=>({...r,...e.isObservableProp(t,s)?{[s]:i}:{}})),{})}static persistStore(e,i){const o=s.getStoreKey(e,i);if(s.persistedStores.has(o))throw new Error(`Duplicate serializable store key: ${o}`);return s.persistedStores.add(i),e.id=o,"wakeup"in e.prototype||(e.prototype.wakeup=r),"addOnChangeListener"in e.prototype||(e.prototype.addOnChangeListener=t),e}}Object.defineProperty(s,"persistedStores",{enumerable:!0,configurable:!0,writable:!0,value:new Set}),module.exports=s;
+"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:i}={}){Object.defineProperty(this,"stores",{enumerable:!0,configurable:!0,writable:!0,value:new Map}),Object.defineProperty(this,"counterStores",{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,i||{}),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}static getStoreKey(e,t,s){const r=t||e.id||e.name||e.constructor.name;return s?`${r}--index${s}`:r}getStore(e,t,s){const i=r.getStoreKey(e,t,s);return this.stores.has(i)?this.stores.get(i):e.isSingleton?this.createStore(e,t):void 0}createStore(e,t){var s,i,o;const n=r.getStoreKey(e,t);if((e.isSingleton||this.options.isSSR)&&this.stores.has(n))return this.stores.get(n);const a=this.counterStores.get(n)||0,l=r.getStoreKey(e,t,a>0?a+1:void 0),u=new e({storeManager:this,...this.storesParams});u.id=l,u.isSingleton=e.isSingleton;const c=this.initState[l],h=this.persistData[l];return c&&(Object.assign(u,c),this.options.shouldRemoveInitState&&delete this.initState[l]),"wakeup"in u&&r.persistedStores.has(l)&&(null===(s=u.wakeup)||void 0===s||s.call(u,u,{initState:c,persistedState:h}),null===(i=u.addOnChangeListener)||void 0===i||i.call(u,u,this)),this.stores.set(l,u),this.counterStores.set(n,a+1),null===(o=u.init)||void 0===o||o.call(u),u}createStores(e){return e.reduce(((e,[t,s])=>{const[r,i]="store"in s?[s.store,s.id]:[s];return{...e,[t]:this.createStore(r,i)}}),{})}mountStores(e){const t=[];return Object.values(e).forEach((e=>{var s;const i=r.getStoreKey(e);if(this.stores.has(i)||this.stores.set(i,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=r.getStoreKey(e);e.isSingleton||(this.stores.delete(s),this.counterStores.set(s.replace(/--index.+$/,""),(null!==(t=this.counterStores.get(s))&&void 0!==t?t:0)-1))}))}}toJSON(){var e,t;const s={};for(const[i,o]of this.stores.entries())s[i]=null!==(t=null===(e=o.toJSON)||void 0===e?void 0:e.call(o))&&void 0!==t?t:r.getObservableProps(o);return s}toPersistedJSON(){var e,t;const s={};for(const i of r.persistedStores){const o=this.stores.get(i);o&&(s[i]=null!==(t=null===(e=o.toJSON)||void 0===e?void 0:e.call(o))&&void 0!==t?t:r.getObservableProps(o))}return s}static getObservableProps(t){const s=e.toJS(t);return Object.entries(s).reduce(((s,[r,i])=>({...s,...e.isObservableProp(t,r)?{[r]:i}:{}})),{})}static persistStore(e,i){if(r.persistedStores.has(i))throw new Error(`Duplicate serializable store key: ${i}`);return r.persistedStores.add(i),e.id=i,"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-f2f6b0e4";
+import { IStorePersisted } from "./types-4732bbd2";
 /**
  * Listen persist store changes
  */

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

@@ -1,4 +1,4 @@
-import { IStorage } from "../types-f2f6b0e4";
+import { IStorage } from "../types-4732bbd2";
 declare class LocalStorage implements IStorage {
     globalKey: string;
     /**

package/lib/{types-f2f6b0e4.d.ts → types-4732bbd2.d.ts}

@@ -18,10 +18,15 @@ interface IStorePersisted extends IStore {
 }
 type TInitStore<TSto extends IStore | IStorePersisted = IStore> = TSto & (IStorePersisted | IStore);
 type IConstructableStore<TSto extends IStore = IStore> = (new (props: IConstructorParams) => TInitStore<TSto>) & Partial<IStorePersisted>;
-type TStoreDefinition<TSto extends IStore | IStorePersisted = any> = IConstructableStore<TSto> | {
-    store: IConstructableStore<TSto>;
-    id: string;
+/**
+ * Store params
+ */
+type IStoreConfig = {
+    id?: string;
 };
+type TStoreDefinition<TSto extends IStore | IStorePersisted = any> = IConstructableStore<TSto> | ({
+    store: IConstructableStore<TSto>;
+} & IStoreConfig);
 type TMapStores = Record<string, TStoreDefinition>;
 interface IManagerParams {
     storesParams?: Omit<IConstructorParams, 'storeManager'>;
@@ -41,6 +46,7 @@ interface IStorage {
 interface IManagerOptions {
     shouldDisablePersist?: boolean;
     shouldRemoveInitState?: boolean;
+    isSSR?: boolean;
 }
 type TStores = {
     [storeKey: string]: IStore | IStorePersisted;
@@ -48,11 +54,13 @@ type TStores = {
 /**
  * Convert class type to class constructor
  */
-type ClassReturnType<T> = T extends new (...args: any) => infer R ? R : never;
+type ClassReturnType<T> = T extends new (...args: any) => infer R ? R : T extends {
+    store: any;
+} ? ClassReturnType<T['store']> : never;
 /**
  * Stores map to type
  */
 type StoresType<TSt> = {
     [keys in keyof TSt]: ClassReturnType<TSt[keys]>;
 };
-export { IConstructorParams, IStoreLifecycle, IStore, IStorePersisted, TInitStore, IConstructableStore, TStoreDefinition, TMapStores, IManagerParams, TWakeup, IStorage, IManagerOptions, TStores, ClassReturnType, StoresType };
+export { IConstructorParams, IStoreLifecycle, IStore, IStorePersisted, TInitStore, IConstructableStore, IStoreConfig, TStoreDefinition, TMapStores, IManagerParams, TWakeup, IStorage, IManagerOptions, TStores, ClassReturnType, StoresType };

package/lib/wakeup.d.ts

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

package/lib/with-stores.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lomray/react-mobx-manager",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.7",
   "description": "This package provides Mobx stores manager for react.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -41,29 +41,29 @@
     "prepare": "husky install"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.0.3",
-    "@commitlint/config-conventional": "^17.0.3",
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
     "@lomray/eslint-config-react": "^2.0.0",
     "@lomray/prettier-config": "^1.2.0",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/react": "^18.0.15",
-    "eslint": "^8.20.0",
+    "eslint": "8.21.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-jsx-a11y": "^6.6.0",
+    "eslint-plugin-jsx-a11y": "^6.6.1",
     "eslint-plugin-prettier": "^4.2.1",
     "husky": "^8.0.1",
     "lint-staged": "^13.0.3",
     "prettier": "^2.7.1",
-    "rollup": "^2.77.0",
+    "rollup": "^2.79.0",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-ts": "^3.0.2",
-    "semantic-release": "^19.0.3",
+    "semantic-release": "^19.0.5",
     "ttypescript": "^1.5.13",
     "typescript": "^4.7.4"
   },
   "peerDependencies": {
     "hoist-non-react-statics": "^3.3.2",
-    "mobx": "^6.6.1",
+    "mobx": "^6.6.2",
     "mobx-react-lite": "^3.4.0",
     "react": "^18 || ^17"
   }