@tramvai/state 1.71.1 → 1.73.0

package/lib/dispatcher/childDispatcherContext.d.ts

@@ -0,0 +1,30 @@
+import type { Dispatcher } from './dispatcher';
+import type { StoreClass } from '../typings';
+import type { Middleware } from './dispatcher.h';
+import { DispatcherContext } from './dispatcherContext';
+declare type InitialState = {
+    stores: Record<string, any>;
+};
+export declare class ChildDispatcherContext<TContext> extends DispatcherContext<TContext> {
+    private parentDispatcherContext;
+    private allowedParentStores;
+    /**
+     * @param context The context to be used for store instances
+     */
+    constructor({ dispatcher, context, initialState, parentDispatcherContext, middlewares, parentAllowedStores, }: {
+        dispatcher: Dispatcher;
+        context: TContext;
+        initialState: InitialState;
+        middlewares?: Middleware[];
+        parentDispatcherContext: DispatcherContext<TContext>;
+        parentAllowedStores?: Array<StoreClass | string | {
+            store: StoreClass | string;
+            optional: true;
+        }>;
+    });
+    getStore<T extends StoreClass>(storeClass: T | string | {
+        store: T | string;
+        optional: true;
+    }): InstanceType<T> | null;
+}
+export {};

package/lib/dispatcher/dispatcherContext.d.ts

@@ -23,13 +23,14 @@ export declare class DispatcherContext<TContext> extends SimpleEmitter {
     };
     rehydratedStoreState: Record<string, any>;
     context: TContext;
-    private fullState;
+    protected fullState: Record<string, any>;
     applyDispatch: <Payload>(event: Event<Payload>) => Payload;
     /**
      * @param context The context to be used for store instances
      */
     constructor(dispatcher: Dispatcher, context: TContext, initialState: InitialState, middlewares?: Middleware[]);
     applyMiddlewares(middlewares: Middleware[]): (...args: any[]) => never;
+    protected storeSubscribe(storeName: string, storeInstance: StoreInstance): void;
     /**
      * @deprecated
      *

package/lib/index.d.ts

@@ -2,6 +2,7 @@ import * as devTools from './devTools';
 export { Middleware } from './dispatcher/dispatcher.h';
 export { createDispatcher, Dispatcher } from './dispatcher/dispatcher';
 export { DispatcherContext, convertAction } from './dispatcher/dispatcherContext';
+export { ChildDispatcherContext } from './dispatcher/childDispatcherContext';
 export { Event } from './createEvent/createEvent.h';
 export { Reducer } from './createReducer/createReducer.h';
 export { createEvent } from './createEvent/createEvent';

package/lib/index.es.js

@@ -129,7 +129,7 @@ class DispatcherContext extends SimpleEmitter {
         if (initialState) {
             this.rehydrate(initialState);
         }
-        if (middlewares) {
+        if (middlewares === null || middlewares === void 0 ? void 0 : middlewares.length) {
             this.applyDispatch = this.applyMiddlewares(middlewares);
         }
         // Инцииализируем уже имеющиеся сторы
@@ -149,6 +149,23 @@ class DispatcherContext extends SimpleEmitter {
         dispatch = compose(...middlewares.map((middleware) => middleware(api)))(this.applyDispatch);
         return dispatch;
     }
+    storeSubscribe(storeName, storeInstance) {
+        const subscribeHandler = () => {
+            const newState = storeInstance.getState();
+            if (newState !== this.fullState[storeName]) {
+                this.fullState = {
+                    ...this.fullState,
+                    [storeName]: newState,
+                };
+                this.emit('change');
+            }
+        };
+        subscribe(storeInstance, subscribeHandler);
+        const unsubscribe = () => {
+            storeInstance.off('change', subscribeHandler);
+        };
+        this.storeUnsubscribeCallbacks[storeName] = unsubscribe;
+    }
     // eslint-disable-next-line max-statements
     getStore(storeClass) {
         let storeClassPrepared;
@@ -184,21 +201,7 @@ class DispatcherContext extends SimpleEmitter {
                 }
                 this.rehydratedStoreState[storeName] = null;
             }
-            const subscribeHandler = () => {
-                const newState = storeInstance.getState();
-                if (newState !== this.fullState[storeName]) {
-                    this.fullState = {
-                        ...this.fullState,
-                        [storeName]: newState,
-                    };
-                    this.emit('change');
-                }
-            };
-            subscribe(storeInstance, subscribeHandler);
-            const unsubscribe = () => {
-                storeInstance.off('change', subscribeHandler);
-            };
-            this.storeUnsubscribeCallbacks[storeName] = unsubscribe;
+            this.storeSubscribe(storeName, storeInstance);
             // TODO: убрать после того отпадёт надобность связывать сторы router и application
             if (Store.dependencies) {
                 Store.dependencies.forEach((dependencyStoreClass) => {
@@ -294,7 +297,7 @@ class DispatcherContext extends SimpleEmitter {
         if ('storeName' in args[0]) {
             const reducer = args[0];
             const callback = args[1];
-            const reducerInstance = this.storeInstances[reducer.storeName];
+            const reducerInstance = this.getStore(reducer);
             const listener = () => {
                 const state = this.getState(reducer);
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -445,6 +448,49 @@ function createDispatcher(options) {
     return new Dispatcher(options);
 }
 
+class ChildDispatcherContext extends DispatcherContext {
+    /**
+     * @param context The context to be used for store instances
+     */
+    constructor({ dispatcher, context, initialState, parentDispatcherContext, middlewares, parentAllowedStores, }) {
+        super(dispatcher, context, initialState, middlewares);
+        this.allowedParentStores = new Set();
+        this.parentDispatcherContext = parentDispatcherContext;
+        parentAllowedStores === null || parentAllowedStores === void 0 ? void 0 : parentAllowedStores.forEach((store) => {
+            const storeName = this.dispatcher.getStoreName(typeof store === 'object' ? store.store : store);
+            this.allowedParentStores.add(storeName);
+            // use just storeName to prevent store initialization on the root-app side
+            this.getStore({ store: storeName, optional: true });
+        });
+    }
+    getStore(storeClass) {
+        let storeClassPrepared;
+        if (typeof storeClass === 'object') {
+            storeClassPrepared = storeClass.store;
+        }
+        else {
+            storeClassPrepared = storeClass;
+        }
+        const storeName = this.dispatcher.getStoreName(storeClassPrepared);
+        if (this.dispatcher.stores[storeName]) {
+            return super.getStore(storeClass);
+        }
+        if (this.allowedParentStores.has(storeName)) {
+            // use just storeName to prevent store initialization on the root-app side
+            const storeInstance = this.parentDispatcherContext.getStore({
+                store: storeName,
+                optional: true,
+            });
+            if (!storeInstance) {
+                return null;
+            }
+            this.storeSubscribe(storeName, storeInstance);
+            return storeInstance;
+        }
+        return super.getStore(storeClass);
+    }
+}
+
 function createEvent(eventName, payloadCreator = identity) {
     if (process.env.NODE_ENV !== 'production') {
         if (!isString(eventName) || !eventName.length) {
@@ -1334,4 +1380,4 @@ function createConnect({ connectHOC = connectAdvanced, mapStateToPropsFactories:
 const connect = /* @__PURE__ */ createConnect();
 const { Consumer } = ConnectContext;
 
-export { BaseStore, Consumer, Dispatcher, DispatcherContext, Provider, Subscription, connect, convertAction, createConnect, createDispatcher, createEvent, createReducer, index as devTools, useActions, useConsumerContext, useIsomorphicLayoutEffect, useSelector, useStore, useStoreSelector };
+export { BaseStore, ChildDispatcherContext, Consumer, Dispatcher, DispatcherContext, Provider, Subscription, connect, convertAction, createConnect, createDispatcher, createEvent, createReducer, index as devTools, useActions, useConsumerContext, useIsomorphicLayoutEffect, useSelector, useStore, useStoreSelector };

package/lib/index.js

@@ -152,7 +152,7 @@ class DispatcherContext extends SimpleEmitter {
         if (initialState) {
             this.rehydrate(initialState);
         }
-        if (middlewares) {
+        if (middlewares === null || middlewares === void 0 ? void 0 : middlewares.length) {
             this.applyDispatch = this.applyMiddlewares(middlewares);
         }
         // Инцииализируем уже имеющиеся сторы
@@ -172,6 +172,23 @@ class DispatcherContext extends SimpleEmitter {
         dispatch = compose__default["default"](...middlewares.map((middleware) => middleware(api)))(this.applyDispatch);
         return dispatch;
     }
+    storeSubscribe(storeName, storeInstance) {
+        const subscribeHandler = () => {
+            const newState = storeInstance.getState();
+            if (newState !== this.fullState[storeName]) {
+                this.fullState = {
+                    ...this.fullState,
+                    [storeName]: newState,
+                };
+                this.emit('change');
+            }
+        };
+        subscribe(storeInstance, subscribeHandler);
+        const unsubscribe = () => {
+            storeInstance.off('change', subscribeHandler);
+        };
+        this.storeUnsubscribeCallbacks[storeName] = unsubscribe;
+    }
     // eslint-disable-next-line max-statements
     getStore(storeClass) {
         let storeClassPrepared;
@@ -207,21 +224,7 @@ class DispatcherContext extends SimpleEmitter {
                 }
                 this.rehydratedStoreState[storeName] = null;
             }
-            const subscribeHandler = () => {
-                const newState = storeInstance.getState();
-                if (newState !== this.fullState[storeName]) {
-                    this.fullState = {
-                        ...this.fullState,
-                        [storeName]: newState,
-                    };
-                    this.emit('change');
-                }
-            };
-            subscribe(storeInstance, subscribeHandler);
-            const unsubscribe = () => {
-                storeInstance.off('change', subscribeHandler);
-            };
-            this.storeUnsubscribeCallbacks[storeName] = unsubscribe;
+            this.storeSubscribe(storeName, storeInstance);
             // TODO: убрать после того отпадёт надобность связывать сторы router и application
             if (Store.dependencies) {
                 Store.dependencies.forEach((dependencyStoreClass) => {
@@ -317,7 +320,7 @@ class DispatcherContext extends SimpleEmitter {
         if ('storeName' in args[0]) {
             const reducer = args[0];
             const callback = args[1];
-            const reducerInstance = this.storeInstances[reducer.storeName];
+            const reducerInstance = this.getStore(reducer);
             const listener = () => {
                 const state = this.getState(reducer);
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -468,6 +471,49 @@ function createDispatcher(options) {
     return new Dispatcher(options);
 }
 
+class ChildDispatcherContext extends DispatcherContext {
+    /**
+     * @param context The context to be used for store instances
+     */
+    constructor({ dispatcher, context, initialState, parentDispatcherContext, middlewares, parentAllowedStores, }) {
+        super(dispatcher, context, initialState, middlewares);
+        this.allowedParentStores = new Set();
+        this.parentDispatcherContext = parentDispatcherContext;
+        parentAllowedStores === null || parentAllowedStores === void 0 ? void 0 : parentAllowedStores.forEach((store) => {
+            const storeName = this.dispatcher.getStoreName(typeof store === 'object' ? store.store : store);
+            this.allowedParentStores.add(storeName);
+            // use just storeName to prevent store initialization on the root-app side
+            this.getStore({ store: storeName, optional: true });
+        });
+    }
+    getStore(storeClass) {
+        let storeClassPrepared;
+        if (typeof storeClass === 'object') {
+            storeClassPrepared = storeClass.store;
+        }
+        else {
+            storeClassPrepared = storeClass;
+        }
+        const storeName = this.dispatcher.getStoreName(storeClassPrepared);
+        if (this.dispatcher.stores[storeName]) {
+            return super.getStore(storeClass);
+        }
+        if (this.allowedParentStores.has(storeName)) {
+            // use just storeName to prevent store initialization on the root-app side
+            const storeInstance = this.parentDispatcherContext.getStore({
+                store: storeName,
+                optional: true,
+            });
+            if (!storeInstance) {
+                return null;
+            }
+            this.storeSubscribe(storeName, storeInstance);
+            return storeInstance;
+        }
+        return super.getStore(storeClass);
+    }
+}
+
 function createEvent(eventName, payloadCreator = identity__default["default"]) {
     if (process.env.NODE_ENV !== 'production') {
         if (!isString__default["default"](eventName) || !eventName.length) {
@@ -1358,6 +1404,7 @@ const connect = /* @__PURE__ */ createConnect();
 const { Consumer } = ConnectContext;
 
 exports.BaseStore = BaseStore;
+exports.ChildDispatcherContext = ChildDispatcherContext;
 exports.Consumer = Consumer;
 exports.Dispatcher = Dispatcher;
 exports.DispatcherContext = DispatcherContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/state",
-  "version": "1.71.1",
+  "version": "1.73.0",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@tinkoff/react-hooks": "0.0.23",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/types-actions-state-context": "1.71.1",
+    "@tramvai/types-actions-state-context": "1.73.0",
     "@types/hoist-non-react-statics": "^3.3.1",
     "invariant": "^2.2.4",
     "react-is": ">=17",