use-typed-reducer 3.2.1 → 3.2.3

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import { MutableRefObject } from "react";
 declare type VoidableFn<Fn extends (...any: any[]) => any> = ReturnType<Fn> extends Promise<any> ? (...a: Parameters<Fn>) => Promise<void> : (...a: Parameters<Fn>) => void;
 declare type Action<State> = (...args: any) => Promise<(state: State) => State> | ((state: State) => State);
 declare type Actions<Actions, State> = {
@@ -6,30 +7,22 @@ declare type Actions<Actions, State> = {
 export declare type Dispatch<ST, Fns extends Actions<Fns, ST>> = {
     [R in keyof Fns]: (...args: any[]) => Promise<(state: ST) => ST> | ((state: ST) => ST);
 };
-declare type ActionPropState<S, P> = (...args: any) => Promise<(state: S, props: P) => S> | ((state: S, props: P) => S);
-declare type ActionPropsState<A, S, P> = {
-    [K in keyof A]: ActionPropState<S, P>;
-};
-declare type DispatchProps<ST extends {}, P, Reducers extends ActionPropsState<Reducers, ST, P>> = {
-    [K in keyof Reducers]: (...args: any[]) => Promise<(state: ST, props: P) => ST> | ((state: ST, props: P) => ST);
-};
-declare type DefaultReducer<S extends {}> = (state: S) => S;
-declare type WithProps<S extends {}, P> = (state: S, props: P) => S;
-export declare type Reducer<S extends {}, A extends (...args: any) => DefaultReducer<S>> = (...params: Parameters<A>) => DefaultReducer<S>;
-export declare type ReducerWithProps<S extends {}, P extends {}, A extends (...args: any) => WithProps<S, P>> = (...params: Parameters<A>) => WithProps<S, P>;
 declare type RemoveReduceReturns<State extends {}, Reducers extends Dispatch<State, Reducers>> = {
     [R in keyof Reducers]: VoidableFn<Reducers[R]>;
 };
 export declare const useTypedReducer: <State extends {}, Reducers extends Dispatch<State, Reducers>>(initialState: State, reducers: Reducers) => [state: State, dispatch: RemoveReduceReturns<State, Reducers>];
-export declare const useReducerWithProps: <State extends {}, Props extends {}, Reducers extends DispatchProps<State, Props, Reducers>>(initialState: State, props: Props, reducers: Reducers) => [state: State, dispatch: Reducers];
 declare type FnMap<State> = {
     [k: string]: (...args: any[]) => Partial<State> | Promise<Partial<State>>;
 };
 declare type MappedReducers<State extends {}, Fns extends FnMap<State>> = {
-    [F in keyof Fns]: (...args: Parameters<Fns[F]>) => State | Promise<State>;
+    [F in keyof Fns]: (...args: Parameters<Fns[F]>) => Promise<Partial<State>> | Partial<State>;
 };
 declare type MapReducerReturn<State extends {}, Fns extends FnMap<State>> = {
     [F in keyof Fns]: VoidableFn<Fns[F]>;
 };
-export declare const useReducer: <State extends {}, Reducers extends (getState: () => State, getProps: () => Props) => MappedReducers<State, FnMap<State>>, Props extends {}>(initialState: State, reducer: Reducers, props?: Props | undefined) => [state: State, dispatchers: MapReducerReturn<State, ReturnType<Reducers>>];
+export declare const useMutable: <T extends {}>(state: T) => MutableRefObject<T>;
+export declare const dispatchCallback: <Prev extends unknown, T extends Prev | ((prev: Prev) => Prev)>(prev: Prev, setter: T) => any;
+export declare type DispatchCallback<T extends any> = T | ((prev: T) => T);
+export declare const useReducer: <State extends {}, Reducers extends (getState: () => State, getProps: () => Props, initialState: State) => MappedReducers<State, FnMap<State>>, Props extends {}, Middlewares extends ((state: State, key: keyof ReturnType<Reducers>) => State)[]>(initialState: State, reducer: Reducers, props?: Props | undefined, middlewares?: Middlewares | undefined) => readonly [state: State, dispatchers: MapReducerReturn<State, ReturnType<Reducers>>];
+export declare const createReducer: <State extends {} = {}, Props extends {} = {}>() => <Reducer extends (getState: () => State, getProps: () => Props, initialState: State) => MappedReducers<State, FnMap<State>>>(reducer: Reducer) => Reducer;
 export default useTypedReducer;

package/dist/index.es.js

@@ -116,49 +116,23 @@ var useTypedReducer = function (initialState, reducers) {
     }, [reducers]);
     return [state, dispatches];
 };
-var useReducerWithProps = function (initialState, props, reducers) {
-    var _a = __read(useState(initialState), 2), state = _a[0], setState = _a[1];
-    var refProps = useRef(props);
-    useEffect(function () {
-        refProps.current = props;
-    }, [props]);
-    var dispatches = useMemo(function () {
-        return entries(reducers).reduce(function (acc, _a) {
-            var _b;
-            var _c = __read(_a, 2), name = _c[0], dispatch = _c[1];
-            return (__assign(__assign({}, acc), (_b = {}, _b[name] = function () {
-                var params = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    params[_i] = arguments[_i];
-                }
-                return __awaiter(void 0, void 0, void 0, function () {
-                    var dispatcher;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, dispatch.apply(void 0, __spread(params))];
-                            case 1:
-                                dispatcher = _a.sent();
-                                setState(function (previousState) { return dispatcher(previousState, refProps.current); });
-                                return [2 /*return*/];
-                        }
-                    });
-                });
-            }, _b)));
-        }, reducers);
-    }, [reducers]);
-    return [state, dispatches];
-};
 var useMutable = function (state) {
     var mutable = useRef(state !== null && state !== void 0 ? state : {});
     useEffect(function () { return void (mutable.current = state); }, [state]);
     return mutable;
 };
-var useReducer = function (initialState, reducer, props) {
+var dispatchCallback = function (prev, setter) {
+    return typeof setter === "function" ? setter(prev) : setter;
+};
+var useReducer = function (initialState, reducer, props, middlewares) {
     var _a = __read(useState(function () { return initialState; }), 2), state = _a[0], setState = _a[1];
     var mutableState = useMutable(state);
     var mutableProps = useMutable(props !== null && props !== void 0 ? props : {});
+    var mutableReducer = useMutable(reducer);
+    var middleware = useMutable(middlewares !== null && middlewares !== void 0 ? middlewares : []);
+    var savedInitialState = useRef(initialState);
     var dispatchers = useMemo(function () {
-        var reducers = reducer(function () { return mutableState.current; }, function () { var _a; return (_a = mutableProps.current) !== null && _a !== void 0 ? _a : {}; });
+        var reducers = mutableReducer.current(function () { return mutableState.current; }, function () { var _a; return (_a = mutableProps.current) !== null && _a !== void 0 ? _a : {}; }, savedInitialState.current);
         return entries(reducers).reduce(function (acc, _a) {
             var _b;
             var _c = __read(_a, 2), name = _c[0], dispatch = _c[1];
@@ -167,15 +141,26 @@ var useReducer = function (initialState, reducer, props) {
                 for (var _i = 0; _i < arguments.length; _i++) {
                     params[_i] = arguments[_i];
                 }
-                var newState = dispatch.apply(void 0, __spread(params));
-                return newState instanceof Promise
-                    ? newState.then(function (state) { return void setState(function (prev) { return (__assign(__assign({}, prev), state)); }); })
-                    : setState(function (previousState) { return (__assign(__assign({}, previousState), newState)); });
+                var st = dispatch.apply(void 0, __spread(params));
+                return st instanceof Promise
+                    ? void st.then(function (state) {
+                        return setState(function (prev) {
+                            return middleware.current.reduce(function (acc, fn) { return fn(acc, name); }, __assign(__assign({}, prev), { state: state }));
+                        });
+                    })
+                    : setState(function (prev) {
+                        return middleware.current.reduce(function (acc, fn) { return fn(acc, name); }, __assign(__assign({}, prev), st));
+                    });
             }, _b)));
-        }, reducers);
-    }, []);
+        }, {});
+    }, [mutableProps, mutableReducer, mutableState]);
     return [state, dispatchers];
+};
+var createReducer = function () {
+    return function (reducer) {
+        return reducer;
+    };
 };
 
 export default useTypedReducer;
-export { useReducer, useReducerWithProps, useTypedReducer };
+export { createReducer, dispatchCallback, useMutable, useReducer, useTypedReducer };

package/dist/index.js

@@ -120,49 +120,23 @@ var useTypedReducer = function (initialState, reducers) {
     }, [reducers]);
     return [state, dispatches];
 };
-var useReducerWithProps = function (initialState, props, reducers) {
-    var _a = __read(react.useState(initialState), 2), state = _a[0], setState = _a[1];
-    var refProps = react.useRef(props);
-    react.useEffect(function () {
-        refProps.current = props;
-    }, [props]);
-    var dispatches = react.useMemo(function () {
-        return entries(reducers).reduce(function (acc, _a) {
-            var _b;
-            var _c = __read(_a, 2), name = _c[0], dispatch = _c[1];
-            return (__assign(__assign({}, acc), (_b = {}, _b[name] = function () {
-                var params = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    params[_i] = arguments[_i];
-                }
-                return __awaiter(void 0, void 0, void 0, function () {
-                    var dispatcher;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, dispatch.apply(void 0, __spread(params))];
-                            case 1:
-                                dispatcher = _a.sent();
-                                setState(function (previousState) { return dispatcher(previousState, refProps.current); });
-                                return [2 /*return*/];
-                        }
-                    });
-                });
-            }, _b)));
-        }, reducers);
-    }, [reducers]);
-    return [state, dispatches];
-};
 var useMutable = function (state) {
     var mutable = react.useRef(state !== null && state !== void 0 ? state : {});
     react.useEffect(function () { return void (mutable.current = state); }, [state]);
     return mutable;
 };
-var useReducer = function (initialState, reducer, props) {
+var dispatchCallback = function (prev, setter) {
+    return typeof setter === "function" ? setter(prev) : setter;
+};
+var useReducer = function (initialState, reducer, props, middlewares) {
     var _a = __read(react.useState(function () { return initialState; }), 2), state = _a[0], setState = _a[1];
     var mutableState = useMutable(state);
     var mutableProps = useMutable(props !== null && props !== void 0 ? props : {});
+    var mutableReducer = useMutable(reducer);
+    var middleware = useMutable(middlewares !== null && middlewares !== void 0 ? middlewares : []);
+    var savedInitialState = react.useRef(initialState);
     var dispatchers = react.useMemo(function () {
-        var reducers = reducer(function () { return mutableState.current; }, function () { var _a; return (_a = mutableProps.current) !== null && _a !== void 0 ? _a : {}; });
+        var reducers = mutableReducer.current(function () { return mutableState.current; }, function () { var _a; return (_a = mutableProps.current) !== null && _a !== void 0 ? _a : {}; }, savedInitialState.current);
         return entries(reducers).reduce(function (acc, _a) {
             var _b;
             var _c = __read(_a, 2), name = _c[0], dispatch = _c[1];
@@ -171,17 +145,30 @@ var useReducer = function (initialState, reducer, props) {
                 for (var _i = 0; _i < arguments.length; _i++) {
                     params[_i] = arguments[_i];
                 }
-                var newState = dispatch.apply(void 0, __spread(params));
-                return newState instanceof Promise
-                    ? newState.then(function (state) { return void setState(function (prev) { return (__assign(__assign({}, prev), state)); }); })
-                    : setState(function (previousState) { return (__assign(__assign({}, previousState), newState)); });
+                var st = dispatch.apply(void 0, __spread(params));
+                return st instanceof Promise
+                    ? void st.then(function (state) {
+                        return setState(function (prev) {
+                            return middleware.current.reduce(function (acc, fn) { return fn(acc, name); }, __assign(__assign({}, prev), { state: state }));
+                        });
+                    })
+                    : setState(function (prev) {
+                        return middleware.current.reduce(function (acc, fn) { return fn(acc, name); }, __assign(__assign({}, prev), st));
+                    });
             }, _b)));
-        }, reducers);
-    }, []);
+        }, {});
+    }, [mutableProps, mutableReducer, mutableState]);
     return [state, dispatchers];
+};
+var createReducer = function () {
+    return function (reducer) {
+        return reducer;
+    };
 };
 
+exports.createReducer = createReducer;
 exports.default = useTypedReducer;
+exports.dispatchCallback = dispatchCallback;
+exports.useMutable = useMutable;
 exports.useReducer = useReducer;
-exports.useReducerWithProps = useReducerWithProps;
 exports.useTypedReducer = useTypedReducer;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "use-typed-reducer",
-    "version": "3.2.1",
+    "version": "3.2.3",
     "description": "use-reducer React hook alternative",
     "author": "g4rcez",
     "license": "MIT",