@tramvai/state 2.108.1 → 2.109.0

package/lib/connect/hooks/index.d.ts

@@ -1,5 +1,6 @@
 export * from './useConsumerContext';
 export * from './useActions';
+export * from './useEvents';
 export * from './useStore';
 export * from './useSelector';
 export * from './useStoreSelector';

package/lib/connect/hooks/useEvents.d.ts

@@ -0,0 +1,7 @@
+import type { Event, EventCreatorN } from '@tramvai/types-actions-state-context';
+type ConvertEventToDispatch<Ev extends EventCreatorN<any>> = Ev extends (...args: infer T) => Event<infer P> ? (...args: T) => P : never;
+export declare function useEvents<Ev extends EventCreatorN<any>>(event: Ev): ConvertEventToDispatch<Ev>;
+export declare function useEvents<Ev extends Readonly<EventCreatorN<any>[]>>(events: Ev): {
+    [key in keyof Ev]: ConvertEventToDispatch<Ev[key]>;
+};
+export {};

package/lib/connect/hooks/useEvents.es.js

@@ -0,0 +1,25 @@
+import isArray from '@tinkoff/utils/is/array';
+import { useMemo } from 'react';
+import { useShallowEqual } from '@tinkoff/react-hooks';
+import { useConsumerContext } from './useConsumerContext.es.js';
+
+function useEvents(events) {
+    const context = useConsumerContext();
+    const eventsRef = useShallowEqual(events);
+    return useMemo(() => {
+        if (isArray(eventsRef)) {
+            return eventsRef.map((event) => (...args) => {
+                const ev = event(...args);
+                context.dispatch(ev);
+                return ev.payload;
+            });
+        }
+        return (...args) => {
+            const ev = eventsRef(...args);
+            context.dispatch(ev);
+            return ev.payload;
+        };
+    }, [eventsRef, context]);
+}
+
+export { useEvents };

package/lib/connect/hooks/useEvents.js

@@ -0,0 +1,33 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var isArray = require('@tinkoff/utils/is/array');
+var React = require('react');
+var reactHooks = require('@tinkoff/react-hooks');
+var useConsumerContext = require('./useConsumerContext.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
+
+function useEvents(events) {
+    const context = useConsumerContext.useConsumerContext();
+    const eventsRef = reactHooks.useShallowEqual(events);
+    return React.useMemo(() => {
+        if (isArray__default["default"](eventsRef)) {
+            return eventsRef.map((event) => (...args) => {
+                const ev = event(...args);
+                context.dispatch(ev);
+                return ev.payload;
+            });
+        }
+        return (...args) => {
+            const ev = eventsRef(...args);
+            context.dispatch(ev);
+            return ev.payload;
+        };
+    }, [eventsRef, context]);
+}
+
+exports.useEvents = useEvents;

package/lib/connect/hooks/useEvents.test-types.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/connect/hooks/useSelector.es.js

@@ -38,7 +38,7 @@ function useSelector(storesOrStore, selector, equalityFn = shallowEqual) {
         selectedState = useSyncExternalStoreWithSelector(subscribe, context.getState, serverState ? () => serverState : context.getState, selector, equalityFn);
     }
     catch (err) {
-        let errorMessage = `An error occured while selecting the store state: ${err.message}.`;
+        let errorMessage = `An error occurred while selecting the store state: ${err.message}.`;
         if (latestSubscriptionCallbackError.current) {
             errorMessage += `\nThe error may be correlated with this previous error:\n${latestSubscriptionCallbackError.current.stack}\n\nOriginal stack trace:`;
         }

package/lib/connect/hooks/useSelector.js

@@ -48,7 +48,7 @@ function useSelector(storesOrStore, selector, equalityFn = shallowEqual__default
         selectedState = withSelector.useSyncExternalStoreWithSelector(subscribe, context$1.getState, serverState ? () => serverState : context$1.getState, selector, equalityFn);
     }
     catch (err) {
-        let errorMessage = `An error occured while selecting the store state: ${err.message}.`;
+        let errorMessage = `An error occurred while selecting the store state: ${err.message}.`;
         if (latestSubscriptionCallbackError.current) {
             errorMessage += `\nThe error may be correlated with this previous error:\n${latestSubscriptionCallbackError.current.stack}\n\nOriginal stack trace:`;
         }

package/lib/connect/hooks/useStoreSelector.d.ts

@@ -1,2 +1,2 @@
 import type { Reducer } from '../..';
-export declare const useStoreSelector: <TState, TPayload>(store: Reducer<TState, string>, selector: (state: TState) => TPayload) => TPayload;
+export declare const useStoreSelector: <TState, TPayload>(store: Reducer<TState, string, any>, selector: (state: TState) => TPayload) => TPayload;

package/lib/createEvent/createEvent.d.ts

@@ -1,4 +1,4 @@
-import type { EmptyEventCreator, EventCreator0, EventCreator1, EventCreator2, EventCreator3, EventCreatorN, PayloadTransformer0, PayloadTransformer1, PayloadTransformer2, PayloadTransformer3, PayloadTransformerN } from './createEvent.h';
+import type { AnyEventCreator, EmptyEventCreator, EventCreator0, EventCreator1, EventCreator2, EventCreator3, EventCreatorN, PayloadTransformer0, PayloadTransformer1, PayloadTransformer2, PayloadTransformer3, PayloadTransformerN } from './createEvent.h';
 export declare function createEvent(description: string): EmptyEventCreator;
 export declare function createEvent<A1>(description: string): EventCreator1<A1>;
 /**
@@ -41,3 +41,4 @@ export declare function createEvent<A1, A2, Payload>(description: string, payloa
  */
 export declare function createEvent<A1, A2, A3, Payload>(description: string, payloadCreator: PayloadTransformer3<A1, A2, A3, Payload>): EventCreator3<A1, A2, A3, Payload>;
 export declare function createEvent<Payload>(description: string, payloadCreator: PayloadTransformerN<Payload>): EventCreatorN<Payload>;
+export declare const isEventCreator: (eventCreator: any) => eventCreator is AnyEventCreator<any>;

package/lib/createEvent/createEvent.es.js

@@ -12,11 +12,15 @@ function createEvent(eventName, payloadCreator = identity) {
         return {
             type,
             payload: payloadCreator(...args),
+            store: eventCreator.store,
         };
     };
     eventCreator.getType = () => type;
     eventCreator.toString = () => type;
     return eventCreator;
 }
+const isEventCreator = (eventCreator) => {
+    return typeof eventCreator === 'function' && 'getType' in eventCreator;
+};
 
-export { createEvent };
+export { createEvent, isEventCreator };

package/lib/createEvent/createEvent.js

@@ -21,11 +21,16 @@ function createEvent(eventName, payloadCreator = identity__default["default"]) {
         return {
             type,
             payload: payloadCreator(...args),
+            store: eventCreator.store,
         };
     };
     eventCreator.getType = () => type;
     eventCreator.toString = () => type;
     return eventCreator;
 }
+const isEventCreator = (eventCreator) => {
+    return typeof eventCreator === 'function' && 'getType' in eventCreator;
+};
 
 exports.createEvent = createEvent;
+exports.isEventCreator = isEventCreator;

package/lib/createReducer/createReducer.d.ts

@@ -1,2 +1,10 @@
-import type { Reducer } from './createReducer.h';
-export declare function createReducer<State = {}, Name extends string = string>(name: Name, initialState: State): Reducer<State, Name>;
+import type { EventHandlersToEventCreators } from '@tramvai/types-actions-state-context';
+import type { EventHandler, Reducer } from './createReducer.h';
+interface Options<Name extends string, State, Events extends Record<string, EventHandler<State, any>>> {
+    name: Name;
+    initialState: State;
+    events?: Events;
+}
+export declare function createReducer<State, Name extends string, Events extends Record<string, EventHandler<State, any>> = Record<string, EventHandler<State, any>>>(options: Options<Name, State, Events>): Reducer<State, Name, EventHandlersToEventCreators<State, Events>>;
+export declare function createReducer<State = {}, Name extends string = string>(name: Name, initialState: State): Reducer<State, Name, never>;
+export {};

package/lib/createReducer/createReducer.es.js

@@ -1,60 +1,70 @@
-import { createEvent } from '../createEvent/createEvent.es.js';
+import { createEvent, isEventCreator } from '../createEvent/createEvent.es.js';
 import { SimpleEmitter } from '../stores/SimpleEmitter.es.js';
 
-function createReducer(name, initialState) {
-    var _a;
+function createReducer(nameOrOptions, initialStateArg) {
+    const { name, initialState } = typeof nameOrOptions === 'object'
+        ? nameOrOptions
+        : { name: nameOrOptions, initialState: initialStateArg };
     const reducers = {};
-    return _a = class ReducerStore extends SimpleEmitter {
-            constructor() {
-                super();
-                this.state = initialState;
-            }
-            static createEvents(model) {
-                const eventNames = Object.keys(model);
-                const events = {};
-                eventNames.forEach((eventName) => {
-                    const handler = model[eventName];
-                    const eventCreator = createEvent(`${eventName}`);
-                    events[eventName] = eventCreator;
-                    ReducerStore.on(eventCreator, handler);
-                });
-                return events;
-            }
-            static on(eventOrType, reducer) {
-                if (Array.isArray(eventOrType)) {
-                    eventOrType.forEach((event) => ReducerStore.on(event, reducer));
-                    return ReducerStore;
-                }
-                const type = eventOrType.toString();
-                ReducerStore.handlers[type] = 'handle';
-                reducers[type] = reducer;
+    class ReducerStore extends SimpleEmitter {
+        constructor() {
+            super();
+            this.state = initialState;
+        }
+        static createEvents(model) {
+            const eventNames = Object.keys(model);
+            const events = {};
+            eventNames.forEach((eventName) => {
+                const handler = model[eventName];
+                const eventCreator = createEvent(`${this.storeName}_${eventName}`);
+                events[eventName] = eventCreator;
+                ReducerStore.on(eventCreator, handler);
+            });
+            return events;
+        }
+        static on(eventOrType, reducer) {
+            if (Array.isArray(eventOrType)) {
+                eventOrType.forEach((event) => ReducerStore.on(event, reducer));
                 return ReducerStore;
             }
-            getState() {
-                return this.state;
+            if (isEventCreator(eventOrType) && !eventOrType.store) {
+                // eslint-disable-next-line no-param-reassign
+                eventOrType.store = ReducerStore;
             }
-            setState(state) {
-                this.state = state;
-                // обновление необходимо, иначе state-manager не пересчитает состояние
+            const type = eventOrType.toString();
+            ReducerStore.handlers[type] = 'handle';
+            reducers[type] = reducer;
+            return ReducerStore;
+        }
+        getState() {
+            return this.state;
+        }
+        setState(state) {
+            this.state = state;
+            // обновление необходимо, иначе state-manager не пересчитает состояние
+            this.emit('change');
+        }
+        dehydrate() {
+            return this.state;
+        }
+        rehydrate(state) {
+            this.state = state;
+        }
+        handle(payload, eventName) {
+            const reducer = reducers[eventName];
+            if (reducer) {
+                this.state = reducer(this.state, payload);
                 this.emit('change');
             }
-            dehydrate() {
-                return this.state;
-            }
-            rehydrate(state) {
-                this.state = state;
-            }
-            handle(payload, eventName) {
-                const reducer = reducers[eventName];
-                if (reducer) {
-                    this.state = reducer(this.state, payload);
-                    this.emit('change');
-                }
-            }
-        },
-        _a.storeName = name,
-        _a.handlers = {},
-        _a;
+        }
+    }
+    ReducerStore.storeName = name;
+    ReducerStore.events = undefined;
+    ReducerStore.handlers = {};
+    if (typeof nameOrOptions === 'object' && nameOrOptions.events) {
+        ReducerStore.events = ReducerStore.createEvents(nameOrOptions.events);
+    }
+    return ReducerStore;
 }
 
 export { createReducer };

package/lib/createReducer/createReducer.js

@@ -5,60 +5,70 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var createEvent = require('../createEvent/createEvent.js');
 var SimpleEmitter = require('../stores/SimpleEmitter.js');
 
-function createReducer(name, initialState) {
-    var _a;
+function createReducer(nameOrOptions, initialStateArg) {
+    const { name, initialState } = typeof nameOrOptions === 'object'
+        ? nameOrOptions
+        : { name: nameOrOptions, initialState: initialStateArg };
     const reducers = {};
-    return _a = class ReducerStore extends SimpleEmitter.SimpleEmitter {
-            constructor() {
-                super();
-                this.state = initialState;
-            }
-            static createEvents(model) {
-                const eventNames = Object.keys(model);
-                const events = {};
-                eventNames.forEach((eventName) => {
-                    const handler = model[eventName];
-                    const eventCreator = createEvent.createEvent(`${eventName}`);
-                    events[eventName] = eventCreator;
-                    ReducerStore.on(eventCreator, handler);
-                });
-                return events;
-            }
-            static on(eventOrType, reducer) {
-                if (Array.isArray(eventOrType)) {
-                    eventOrType.forEach((event) => ReducerStore.on(event, reducer));
-                    return ReducerStore;
-                }
-                const type = eventOrType.toString();
-                ReducerStore.handlers[type] = 'handle';
-                reducers[type] = reducer;
+    class ReducerStore extends SimpleEmitter.SimpleEmitter {
+        constructor() {
+            super();
+            this.state = initialState;
+        }
+        static createEvents(model) {
+            const eventNames = Object.keys(model);
+            const events = {};
+            eventNames.forEach((eventName) => {
+                const handler = model[eventName];
+                const eventCreator = createEvent.createEvent(`${this.storeName}_${eventName}`);
+                events[eventName] = eventCreator;
+                ReducerStore.on(eventCreator, handler);
+            });
+            return events;
+        }
+        static on(eventOrType, reducer) {
+            if (Array.isArray(eventOrType)) {
+                eventOrType.forEach((event) => ReducerStore.on(event, reducer));
                 return ReducerStore;
             }
-            getState() {
-                return this.state;
+            if (createEvent.isEventCreator(eventOrType) && !eventOrType.store) {
+                // eslint-disable-next-line no-param-reassign
+                eventOrType.store = ReducerStore;
             }
-            setState(state) {
-                this.state = state;
-                // обновление необходимо, иначе state-manager не пересчитает состояние
+            const type = eventOrType.toString();
+            ReducerStore.handlers[type] = 'handle';
+            reducers[type] = reducer;
+            return ReducerStore;
+        }
+        getState() {
+            return this.state;
+        }
+        setState(state) {
+            this.state = state;
+            // обновление необходимо, иначе state-manager не пересчитает состояние
+            this.emit('change');
+        }
+        dehydrate() {
+            return this.state;
+        }
+        rehydrate(state) {
+            this.state = state;
+        }
+        handle(payload, eventName) {
+            const reducer = reducers[eventName];
+            if (reducer) {
+                this.state = reducer(this.state, payload);
                 this.emit('change');
             }
-            dehydrate() {
-                return this.state;
-            }
-            rehydrate(state) {
-                this.state = state;
-            }
-            handle(payload, eventName) {
-                const reducer = reducers[eventName];
-                if (reducer) {
-                    this.state = reducer(this.state, payload);
-                    this.emit('change');
-                }
-            }
-        },
-        _a.storeName = name,
-        _a.handlers = {},
-        _a;
+        }
+    }
+    ReducerStore.storeName = name;
+    ReducerStore.events = undefined;
+    ReducerStore.handlers = {};
+    if (typeof nameOrOptions === 'object' && nameOrOptions.events) {
+        ReducerStore.events = ReducerStore.createEvents(nameOrOptions.events);
+    }
+    return ReducerStore;
 }
 
 exports.createReducer = createReducer;

package/lib/createReducer/createReducer.test-types.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/dispatcher/dispatcherContext.es.js

@@ -32,15 +32,22 @@ class DispatcherContext extends SimpleEmitter {
     constructor(dispatcher, context, initialState, middlewares) {
         super();
         this.applyDispatch = (event) => {
-            const eventHandlers = this.dispatcher.handlers[event.type] || [];
+            let eventHandlers = this.dispatcher.handlers[event.type] || [];
             if (!eventHandlers.length) {
-                if (process.env.NODE_ENV === 'development') {
-                    console.warn(`
+                if (event.store) {
+                    this.registerStore(event.store);
+                    eventHandlers = this.dispatcher.handlers[event.type] || [];
+                }
+                else {
+                    if (process.env.NODE_ENV === 'development') {
+                        // fallback to previous versions of createEvent
+                        console.warn(`
 The event "${event.type}" has been dispatched, but no reducers for this event were registered.
 Have you forgot to register reducer or add event handler in existing reducer?
 `);
+                    }
+                    return event.payload;
                 }
-                return event.payload;
             }
             this.applyHandlers(event, eventHandlers);
             return event.payload;

package/lib/dispatcher/dispatcherContext.js

@@ -40,15 +40,22 @@ class DispatcherContext extends SimpleEmitter.SimpleEmitter {
     constructor(dispatcher, context, initialState, middlewares) {
         super();
         this.applyDispatch = (event) => {
-            const eventHandlers = this.dispatcher.handlers[event.type] || [];
+            let eventHandlers = this.dispatcher.handlers[event.type] || [];
             if (!eventHandlers.length) {
-                if (process.env.NODE_ENV === 'development') {
-                    console.warn(`
+                if (event.store) {
+                    this.registerStore(event.store);
+                    eventHandlers = this.dispatcher.handlers[event.type] || [];
+                }
+                else {
+                    if (process.env.NODE_ENV === 'development') {
+                        // fallback to previous versions of createEvent
+                        console.warn(`
 The event "${event.type}" has been dispatched, but no reducers for this event were registered.
 Have you forgot to register reducer or add event handler in existing reducer?
 `);
+                    }
+                    return event.payload;
                 }
-                return event.payload;
             }
             this.applyHandlers(event, eventHandlers);
             return event.payload;

package/lib/index.es.js

@@ -12,6 +12,7 @@ export { scheduling } from './connect/scheduling.es.js';
 export { Provider } from './connect/Provider.es.js';
 export { useConsumerContext } from './connect/hooks/useConsumerContext.es.js';
 export { useActions } from './connect/hooks/useActions.es.js';
+export { useEvents } from './connect/hooks/useEvents.es.js';
 export { useStore } from './connect/hooks/useStore.es.js';
 export { useSelector } from './connect/hooks/useSelector.es.js';
 export { useStoreSelector } from './connect/hooks/useStoreSelector.es.js';

package/lib/index.js

@@ -15,6 +15,7 @@ var scheduling = require('./connect/scheduling.js');
 var Provider = require('./connect/Provider.js');
 var useConsumerContext = require('./connect/hooks/useConsumerContext.js');
 var useActions = require('./connect/hooks/useActions.js');
+var useEvents = require('./connect/hooks/useEvents.js');
 var useStore = require('./connect/hooks/useStore.js');
 var useSelector = require('./connect/hooks/useSelector.js');
 var useStoreSelector = require('./connect/hooks/useStoreSelector.js');
@@ -39,6 +40,7 @@ exports.scheduling = scheduling.scheduling;
 exports.Provider = Provider.Provider;
 exports.useConsumerContext = useConsumerContext.useConsumerContext;
 exports.useActions = useActions.useActions;
+exports.useEvents = useEvents.useEvents;
 exports.useStore = useStore.useStore;
 exports.useSelector = useSelector.useSelector;
 exports.useStoreSelector = useStoreSelector.useStoreSelector;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/state",
-  "version": "2.108.1",
+  "version": "2.109.0",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -19,7 +19,7 @@
   "dependencies": {
     "@tinkoff/react-hooks": "0.1.6",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/types-actions-state-context": "2.108.1",
+    "@tramvai/types-actions-state-context": "2.109.0",
     "@types/hoist-non-react-statics": "^3.3.1",
     "invariant": "^2.2.4",
     "react-is": ">=17",
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@reatom/core": "^1.1.5",
-    "@tramvai/core": "2.108.1",
+    "@tramvai/core": "2.109.0",
     "@types/invariant": "^2.2.31",
     "@types/react-is": "^17.0.0",
     "@types/use-sync-external-store": "^0.0.3",