@kuindji/reactive 1.0.21 → 1.0.24

package/dist/react/useAction.js

@@ -1,18 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useAction = useAction;
-const react_1 = require("react");
-const action_1 = require("../action");
-const ErrorBoundary_1 = require("./ErrorBoundary");
-function useAction(actionSignature, listener, errorListener, beforeActionListener) {
-    const boundaryErrorListener = (0, react_1.useContext)(ErrorBoundary_1.ErrorBoundaryContext);
-    const updateRef = (0, react_1.useRef)(0);
-    const listenerRef = (0, react_1.useRef)(listener);
-    const errorListenerRef = (0, react_1.useRef)(errorListener);
-    const boundaryErrorListenerRef = (0, react_1.useRef)(boundaryErrorListener);
-    const beforeActionListenerRef = (0, react_1.useRef)(beforeActionListener);
-    const action = (0, react_1.useMemo)(() => {
-        const action = (0, action_1.createAction)(actionSignature);
+import { useContext, useEffect, useMemo, useRef } from "react";
+import { createAction } from "../action";
+import { ErrorBoundaryContext } from "./ErrorBoundary";
+export function useAction(actionSignature, listener, errorListener, beforeActionListener) {
+    const boundaryErrorListener = useContext(ErrorBoundaryContext);
+    const updateRef = useRef(0);
+    const listenerRef = useRef(listener);
+    const errorListenerRef = useRef(errorListener);
+    const boundaryErrorListenerRef = useRef(boundaryErrorListener);
+    const beforeActionListenerRef = useRef(beforeActionListener);
+    const action = useMemo(() => {
+        const action = createAction(actionSignature);
         if (listenerRef.current) {
             action.addListener(listenerRef.current);
         }
@@ -27,13 +24,13 @@ function useAction(actionSignature, listener, errorListener, beforeActionListene
         }
         return action;
     }, []);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (updateRef.current > 0) {
             throw new Error("Action cannot be updated");
         }
         updateRef.current++;
     }, [actionSignature]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (listenerRef.current !== listener) {
             if (listenerRef.current) {
                 action.removeListener(listenerRef.current);
@@ -44,7 +41,7 @@ function useAction(actionSignature, listener, errorListener, beforeActionListene
             }
         }
     }, [listener]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (errorListenerRef.current !== errorListener) {
             if (errorListenerRef.current) {
                 action.removeErrorListener(errorListenerRef.current);
@@ -55,7 +52,7 @@ function useAction(actionSignature, listener, errorListener, beforeActionListene
             }
         }
     }, [errorListener]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (boundaryErrorListenerRef.current !== boundaryErrorListener) {
             if (boundaryErrorListenerRef.current) {
                 action.removeErrorListener(boundaryErrorListenerRef.current);
@@ -66,7 +63,7 @@ function useAction(actionSignature, listener, errorListener, beforeActionListene
             }
         }
     }, [boundaryErrorListener]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (beforeActionListenerRef.current !== beforeActionListener) {
             if (beforeActionListenerRef.current) {
                 action.removeBeforeActionListener(beforeActionListenerRef.current);
@@ -77,7 +74,7 @@ function useAction(actionSignature, listener, errorListener, beforeActionListene
             }
         }
     }, [beforeActionListener]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         return () => {
             if (listenerRef.current) {
                 listenerRef.current = null;

package/dist/react/useActionBus.js

@@ -1,15 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useActionBus = useActionBus;
-const react_1 = require("react");
-const actionBus_1 = require("../actionBus");
-const ErrorBoundary_1 = require("./ErrorBoundary");
-function useActionBus(initialActions, errorListener) {
-    const boundaryErrorListener = (0, react_1.useContext)(ErrorBoundary_1.ErrorBoundaryContext);
-    const errorListenerRef = (0, react_1.useRef)(errorListener);
-    const boundaryErrorListenerRef = (0, react_1.useRef)(boundaryErrorListener);
-    const actionBus = (0, react_1.useMemo)(() => {
-        const actionBus = (0, actionBus_1.createActionBus)(initialActions);
+import { useContext, useEffect, useMemo, useRef } from "react";
+import { createActionBus } from "../actionBus";
+import { ErrorBoundaryContext } from "./ErrorBoundary";
+export function useActionBus(initialActions, errorListener) {
+    const boundaryErrorListener = useContext(ErrorBoundaryContext);
+    const errorListenerRef = useRef(errorListener);
+    const boundaryErrorListenerRef = useRef(boundaryErrorListener);
+    const actionBus = useMemo(() => {
+        const actionBus = createActionBus(initialActions);
         if (errorListener) {
             actionBus.addErrorListener(errorListener);
         }
@@ -18,7 +15,7 @@ function useActionBus(initialActions, errorListener) {
         }
         return actionBus;
     }, []);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (errorListenerRef.current !== errorListener) {
             if (errorListenerRef.current) {
                 actionBus.removeErrorListener(errorListenerRef.current);
@@ -29,7 +26,7 @@ function useActionBus(initialActions, errorListener) {
             }
         }
     }, [errorListener]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (boundaryErrorListenerRef.current !== boundaryErrorListener) {
             if (boundaryErrorListenerRef.current) {
                 actionBus.removeErrorListener(boundaryErrorListenerRef.current);

package/dist/react/useActionMap.js

@@ -1,21 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useActionMap = useActionMap;
-const react_1 = require("react");
-const actionMap_1 = require("../actionMap");
-const ErrorBoundary_1 = require("./ErrorBoundary");
-function useActionMap(actions, errorListener) {
-    const boundaryErrorListener = (0, react_1.useContext)(ErrorBoundary_1.ErrorBoundaryContext);
-    const changeRef = (0, react_1.useRef)(0);
-    const actionMap = (0, react_1.useMemo)(() => {
+import { useContext, useEffect, useMemo, useRef } from "react";
+import { createActionMap } from "../actionMap";
+import { ErrorBoundaryContext } from "./ErrorBoundary";
+export function useActionMap(actions, errorListener) {
+    const boundaryErrorListener = useContext(ErrorBoundaryContext);
+    const changeRef = useRef(0);
+    const actionMap = useMemo(() => {
         const errorListeners = [
             ...(errorListener ? [errorListener] : []),
             ...(boundaryErrorListener ? [boundaryErrorListener] : []),
         ].filter(l => l !== undefined);
-        const actionMap = (0, actionMap_1.createActionMap)(actions, errorListeners);
+        const actionMap = createActionMap(actions, errorListeners);
         return actionMap;
     }, []);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (changeRef.current > 0) {
             throw new Error("useActionMap() does not support changing actions or errorListener");
         }

package/dist/react/useEvent.js

@@ -1,16 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useEvent = useEvent;
-const react_1 = require("react");
-const event_1 = require("../event");
-const ErrorBoundary_1 = require("./ErrorBoundary");
-function useEvent(eventOptions = {}, listener, errorListener) {
-    const boundaryErrorListener = (0, react_1.useContext)(ErrorBoundary_1.ErrorBoundaryContext);
-    const listenerRef = (0, react_1.useRef)(listener);
-    const errorListenerRef = (0, react_1.useRef)(errorListener);
-    const boundaryErrorListenerRef = (0, react_1.useRef)(boundaryErrorListener);
-    const event = (0, react_1.useMemo)(() => {
-        const event = (0, event_1.createEvent)(eventOptions);
+import { useContext, useEffect, useMemo, useRef } from "react";
+import { createEvent } from "../event";
+import { ErrorBoundaryContext } from "./ErrorBoundary";
+export function useEvent(eventOptions = {}, listener, errorListener) {
+    const boundaryErrorListener = useContext(ErrorBoundaryContext);
+    const listenerRef = useRef(listener);
+    const errorListenerRef = useRef(errorListener);
+    const boundaryErrorListenerRef = useRef(boundaryErrorListener);
+    const event = useMemo(() => {
+        const event = createEvent(eventOptions);
         if (listenerRef.current) {
             event.addListener(listenerRef.current);
         }
@@ -22,7 +19,7 @@ function useEvent(eventOptions = {}, listener, errorListener) {
         }
         return event;
     }, []);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (listenerRef.current !== listener) {
             if (listenerRef.current) {
                 event.removeListener(listenerRef.current);
@@ -33,7 +30,7 @@ function useEvent(eventOptions = {}, listener, errorListener) {
             }
         }
     }, [listener]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (errorListenerRef.current !== errorListener) {
             if (errorListenerRef.current) {
                 event.removeErrorListener(errorListenerRef.current);
@@ -44,7 +41,7 @@ function useEvent(eventOptions = {}, listener, errorListener) {
             }
         }
     }, [errorListener]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (boundaryErrorListenerRef.current !== boundaryErrorListener) {
             if (boundaryErrorListenerRef.current) {
                 event.removeErrorListener(boundaryErrorListenerRef.current);
@@ -55,7 +52,7 @@ function useEvent(eventOptions = {}, listener, errorListener) {
             }
         }
     }, [boundaryErrorListener]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         return () => {
             if (listenerRef.current) {
                 event.removeListener(listenerRef.current);

package/dist/react/useEventBus.js

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useEventBus = useEventBus;
-const react_1 = require("react");
-const eventBus_1 = require("../eventBus");
-const ErrorBoundary_1 = require("./ErrorBoundary");
-function useEventBus(eventBusOptions, allEventsListener, errorListener) {
-    const boundaryErrorListener = (0, react_1.useContext)(ErrorBoundary_1.ErrorBoundaryContext);
-    const updateRef = (0, react_1.useRef)(0);
-    const errorListenerRef = (0, react_1.useRef)(errorListener || null);
-    const allEventsListenerRef = (0, react_1.useRef)(allEventsListener || null);
-    const boundaryErrorListenerRef = (0, react_1.useRef)(boundaryErrorListener || null);
-    const eventBus = (0, react_1.useMemo)(() => {
-        const eventBus = (0, eventBus_1.createEventBus)(eventBusOptions);
+import { useContext, useEffect, useMemo, useRef } from "react";
+import { createEventBus, } from "../eventBus";
+import { ErrorBoundaryContext } from "./ErrorBoundary";
+export function useEventBus(eventBusOptions, allEventsListener, errorListener) {
+    const boundaryErrorListener = useContext(ErrorBoundaryContext);
+    const updateRef = useRef(0);
+    const errorListenerRef = useRef(errorListener || null);
+    const allEventsListenerRef = useRef(allEventsListener || null);
+    const boundaryErrorListenerRef = useRef(boundaryErrorListener || null);
+    const eventBus = useMemo(() => {
+        const eventBus = createEventBus(eventBusOptions);
         if (allEventsListener) {
             eventBus.addAllEventsListener(allEventsListener);
         }
@@ -23,7 +20,7 @@ function useEventBus(eventBusOptions, allEventsListener, errorListener) {
         }
         return eventBus;
     }, []);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (eventBusOptions) {
             if (updateRef.current > 0) {
                 throw new Error("EventBus options can't be updated");
@@ -31,7 +28,7 @@ function useEventBus(eventBusOptions, allEventsListener, errorListener) {
             updateRef.current++;
         }
     }, [eventBusOptions]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (allEventsListenerRef.current !== allEventsListener) {
             if (allEventsListenerRef.current) {
                 eventBus.removeAllEventsListener(allEventsListenerRef.current);
@@ -42,7 +39,7 @@ function useEventBus(eventBusOptions, allEventsListener, errorListener) {
             }
         }
     }, [allEventsListener]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (errorListenerRef.current !== errorListener) {
             if (errorListenerRef.current) {
                 eventBus.removeErrorListener(errorListenerRef.current);
@@ -53,7 +50,7 @@ function useEventBus(eventBusOptions, allEventsListener, errorListener) {
             }
         }
     }, [errorListener]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (boundaryErrorListenerRef.current !== boundaryErrorListener) {
             if (boundaryErrorListenerRef.current) {
                 eventBus.removeErrorListener(boundaryErrorListenerRef.current);
@@ -65,7 +62,7 @@ function useEventBus(eventBusOptions, allEventsListener, errorListener) {
             }
         }
     }, [boundaryErrorListener]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         return () => {
             if (allEventsListenerRef.current) {
                 eventBus.removeAllEventsListener(allEventsListenerRef.current);

package/dist/react/useListenToAction.js

@@ -1,23 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useListenToAction = useListenToAction;
-const react_1 = require("react");
-function useListenToAction(action, listener, errorListener, beforeActionListener) {
-    const listenerRef = (0, react_1.useRef)(listener);
-    const actionRef = (0, react_1.useRef)(action);
-    const errorListenerRef = (0, react_1.useRef)(null);
-    const beforeActionListenerRef = (0, react_1.useRef)(null);
+import { useCallback, useEffect, useRef } from "react";
+export function useListenToAction(action, listener, errorListener, beforeActionListener) {
+    const listenerRef = useRef(listener);
+    const actionRef = useRef(action);
+    const errorListenerRef = useRef(null);
+    const beforeActionListenerRef = useRef(null);
     listenerRef.current = listener;
-    const genericHandler = (0, react_1.useCallback)((arg) => {
+    const genericHandler = useCallback((arg) => {
         var _a;
         (_a = listenerRef.current) === null || _a === void 0 ? void 0 : _a.call(listenerRef, arg);
     }, []);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         actionRef.current.removeListener(genericHandler);
         actionRef.current = action;
         actionRef.current.addListener(genericHandler);
     }, [action]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (errorListenerRef.current !== errorListener) {
             if (errorListenerRef.current) {
                 actionRef.current.removeErrorListener(errorListenerRef.current);
@@ -28,7 +25,7 @@ function useListenToAction(action, listener, errorListener, beforeActionListener
             }
         }
     }, [errorListener]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         if (beforeActionListenerRef.current !== beforeActionListener) {
             if (beforeActionListenerRef.current) {
                 actionRef.current.removeBeforeActionListener(beforeActionListenerRef.current);
@@ -39,7 +36,7 @@ function useListenToAction(action, listener, errorListener, beforeActionListener
             }
         }
     }, [beforeActionListener]);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         return () => {
             actionRef.current.removeListener(genericHandler);
             if (errorListenerRef.current) {

package/dist/react/useListenToActionBus.js

@@ -1,50 +1,39 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useListenToActionBus = useListenToActionBus;
-const react_1 = require("react");
-function useListenToActionBus(actionBus, actionName, listener, options, errorListener, beforeActionListener) {
+import { useCallback, useEffect, useRef } from "react";
+export function useListenToActionBus(actionBus, actionName, listener, options, errorListener, beforeActionListener) {
     if (listener && typeof listener !== "function") {
         options = listener.options;
         errorListener = listener.errorListener;
         beforeActionListener = listener.beforeActionListener;
         listener = listener.listener;
     }
-    const actionBusRef = (0, react_1.useRef)(actionBus);
-    const listenerRef = (0, react_1.useRef)(listener || null);
-    const errorListenerRef = (0, react_1.useRef)(null);
-    const beforeActionListenerRef = (0, react_1.useRef)(null);
+    const listenerRef = useRef(listener || null);
+    const beforeActionListenerRef = useRef(null);
     listenerRef.current = listener || null;
-    errorListenerRef.current = errorListener || null;
     beforeActionListenerRef.current = beforeActionListener || null;
-    const genericHandler = (0, react_1.useCallback)((arg) => {
+    const genericHandler = useCallback((arg) => {
         var _a;
         return (_a = listenerRef.current) === null || _a === void 0 ? void 0 : _a.call(listenerRef, arg);
     }, []);
-    const genericBeforeActionHandler = (0, react_1.useCallback)((...args) => {
+    const genericBeforeActionHandler = useCallback((...args) => {
         var _a;
         return ((_a = beforeActionListenerRef.current) === null || _a === void 0 ? void 0 : _a.call(beforeActionListenerRef, ...args)) || undefined;
     }, []);
-    const genericErrorListener = (0, react_1.useCallback)((arg) => {
-        var _a;
-        return (_a = errorListenerRef.current) === null || _a === void 0 ? void 0 : _a.call(errorListenerRef, arg);
-    }, []);
-    (0, react_1.useEffect)(() => {
+    // Main listener + beforeAction listener - tied to actionName
+    useEffect(() => {
+        actionBus.addListener(actionName, genericHandler, options || undefined);
+        actionBus.get(actionName).addBeforeActionListener(genericBeforeActionHandler);
         return () => {
-            actionBusRef.current.removeListener(actionName, genericHandler);
-            actionBusRef.current.get(actionName)
-                .removeBeforeActionListener(genericBeforeActionHandler);
-            actionBusRef.current.removeErrorListener(genericErrorListener);
+            actionBus.removeListener(actionName, genericHandler);
+            actionBus.get(actionName).removeBeforeActionListener(genericBeforeActionHandler);
         };
-    }, []);
-    (0, react_1.useEffect)(() => {
-        actionBusRef.current.removeListener(actionName, genericHandler);
-        actionBusRef.current.get(actionName)
-            .removeBeforeActionListener(genericBeforeActionHandler);
-        actionBusRef.current.removeErrorListener(genericErrorListener);
-        actionBusRef.current = actionBus;
-        actionBusRef.current.addListener(actionName, genericHandler, options || undefined);
-        actionBusRef.current.get(actionName)
-            .addBeforeActionListener(genericBeforeActionHandler);
-        actionBusRef.current.addErrorListener(genericErrorListener);
-    }, [actionBus]);
+    }, [actionBus, actionName, genericHandler, genericBeforeActionHandler]);
+    // Error listener - bus level
+    useEffect(() => {
+        if (errorListener) {
+            actionBus.addErrorListener(errorListener);
+            return () => {
+                actionBus.removeErrorListener(errorListener);
+            };
+        }
+    }, [actionBus, errorListener]);
 }

package/dist/react/useListenToEvent.js

@@ -1,34 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useListenToEvent = useListenToEvent;
-const react_1 = require("react");
-function useListenToEvent(event, listener, options, errorListener) {
-    const listenerRef = (0, react_1.useRef)(listener);
-    const eventRef = (0, react_1.useRef)(event);
-    const errorListenerRef = (0, react_1.useRef)(errorListener);
+import { useCallback, useEffect, useRef } from "react";
+export function useListenToEvent(event, listener, options, errorListener) {
+    const listenerRef = useRef(listener);
     listenerRef.current = listener;
-    const genericHandler = (0, react_1.useCallback)((...args) => {
+    const genericHandler = useCallback((...args) => {
         return listenerRef.current(...args);
     }, []);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
+        event.addListener(genericHandler, options);
         return () => {
-            eventRef.current.removeListener(genericHandler);
+            event.removeListener(genericHandler);
         };
-    }, []);
-    (0, react_1.useEffect)(() => {
-        eventRef.current.removeListener(genericHandler);
-        eventRef.current = event;
-        eventRef.current.addListener(genericHandler, options);
-    }, [event]);
-    (0, react_1.useEffect)(() => {
-        if (errorListenerRef.current !== errorListener) {
-            if (errorListenerRef.current) {
-                eventRef.current.removeErrorListener(errorListenerRef.current);
-            }
-            errorListenerRef.current = errorListener;
-            if (errorListener) {
-                eventRef.current.addErrorListener(errorListener);
-            }
+    }, [event, genericHandler]);
+    useEffect(() => {
+        if (errorListener) {
+            event.addErrorListener(errorListener);
+            return () => {
+                event.removeErrorListener(errorListener);
+            };
         }
-    }, [errorListener]);
+    }, [event, errorListener]);
 }

package/dist/react/useListenToEventBus.js

@@ -1,38 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useListenToEventBus = useListenToEventBus;
-const react_1 = require("react");
-function useListenToEventBus(eventBus, eventName, listener, options, errorListener) {
-    const listenerRef = (0, react_1.useRef)(listener);
-    const eventBusRef = (0, react_1.useRef)(eventBus);
-    const errorListenerRef = (0, react_1.useRef)(errorListener);
+import { useCallback, useEffect, useRef } from "react";
+export function useListenToEventBus(eventBus, eventName, listener, options, errorListener) {
+    const listenerRef = useRef(listener);
     listenerRef.current = listener;
-    const genericHandler = (0, react_1.useCallback)((...args) => {
+    const genericHandler = useCallback((...args) => {
         var _a;
         return (_a = listenerRef.current) === null || _a === void 0 ? void 0 : _a.call(listenerRef, ...args);
     }, []);
-    (0, react_1.useEffect)(() => {
+    // Main listener - cleanup pattern handles eventBus/eventName changes
+    useEffect(() => {
+        eventBus.addListener(eventName, genericHandler, options);
         return () => {
-            eventBusRef.current.removeListener(eventName, genericHandler);
-            if (errorListenerRef.current) {
-                eventBusRef.current.removeErrorListener(errorListenerRef.current);
-            }
+            eventBus.removeListener(eventName, genericHandler);
         };
-    }, []);
-    (0, react_1.useEffect)(() => {
-        eventBusRef.current.removeListener(eventName, genericHandler);
-        eventBusRef.current = eventBus;
-        eventBusRef.current.addListener(eventName, genericHandler, options);
-    }, [eventBus]);
-    (0, react_1.useEffect)(() => {
-        if (errorListenerRef.current !== errorListener) {
-            if (errorListenerRef.current) {
-                eventBusRef.current.removeErrorListener(errorListenerRef.current);
-            }
-            errorListenerRef.current = errorListener;
-            if (errorListener) {
-                eventBusRef.current.addErrorListener(errorListener);
-            }
+    }, [eventBus, eventName, genericHandler]);
+    // Error listener - cleanup pattern
+    useEffect(() => {
+        if (errorListener) {
+            eventBus.addErrorListener(errorListener);
+            return () => {
+                eventBus.removeErrorListener(errorListener);
+            };
         }
-    }, [errorListener]);
+    }, [eventBus, errorListener]);
 }

package/dist/react/useListenToStoreChanges.js

@@ -1,22 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useListenToStoreChanges = useListenToStoreChanges;
-const react_1 = require("react");
-function useListenToStoreChanges(store, key, listener, options) {
-    const listenerRef = (0, react_1.useRef)(listener);
-    const storeRef = (0, react_1.useRef)(store);
+import { useCallback, useEffect, useRef } from "react";
+export function useListenToStoreChanges(store, key, listener, options) {
+    const listenerRef = useRef(listener);
     listenerRef.current = listener;
-    const genericHandler = (0, react_1.useCallback)((value, previousValue) => {
+    const genericHandler = useCallback((value, previousValue) => {
         return listenerRef.current(value, previousValue);
     }, []);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
+        store.onChange(key, genericHandler, options);
         return () => {
-            storeRef.current.removeOnChange(key, genericHandler);
+            store.removeOnChange(key, genericHandler);
         };
-    }, []);
-    (0, react_1.useEffect)(() => {
-        storeRef.current.removeOnChange(key, genericHandler);
-        storeRef.current = store;
-        storeRef.current.onChange(key, genericHandler, options);
-    }, [store]);
+    }, [store, key, genericHandler]);
 }

package/dist/react/useStore.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useStore = useStore;
-const react_1 = require("react");
-const store_1 = require("../store");
-function useStore(initialData = {}, config) {
-    const store = (0, react_1.useMemo)(() => {
-        const store = (0, store_1.createStore)(initialData);
+import { useMemo } from "react";
+import { createStore } from "../store";
+export function useStore(initialData = {}, config) {
+    const store = useMemo(() => {
+        const store = createStore(initialData);
         if (config === null || config === void 0 ? void 0 : config.onChange) {
             for (const key in config.onChange) {
                 store.onChange(key, config.onChange[key]);
@@ -13,15 +10,14 @@ function useStore(initialData = {}, config) {
         }
         if (config === null || config === void 0 ? void 0 : config.pipes) {
             for (const key in config.pipes) {
-                // @ts-expect-error
+                // @ts-expect-error - TS widens for-in key to string; types are correct
                 store.pipe(key, config.pipes[key]);
             }
         }
         if (config === null || config === void 0 ? void 0 : config.control) {
             for (const key in config.control) {
-                store.control(
-                // @ts-expect-error
-                key, config.control[key]);
+                // @ts-expect-error - TS widens for-in key to string; types are correct
+                store.control(key, config.control[key]);
             }
         }
         return store;

package/dist/react/useStoreState.d.ts

@@ -1,3 +1,3 @@
 import { KeyOf } from "../lib/types";
 import { BaseStore } from "../store";
-export declare function useStoreState<TStore extends BaseStore, TKey extends KeyOf<TStore["__type"]["propTypes"]>>(store: TStore, key: TKey): readonly [TStore["__type"]["propTypes"][TKey], (value: TStore["__type"]["propTypes"][TKey] | ((previousValue?: TStore["__type"]["propTypes"][TKey] | undefined) => TStore["__type"]["propTypes"][TKey])) => void];
+export declare function useStoreState<TStore extends BaseStore, TKey extends KeyOf<TStore["__type"]["propTypes"]>>(store: TStore, key: TKey): readonly [TStore["__type"]["propTypes"][TKey], (value: TStore["__type"]["propTypes"][TKey] | ((previousValue?: TStore["__type"]["propTypes"][TKey]) => TStore["__type"]["propTypes"][TKey])) => void];