redux-sacala 0.0.18 → 0.2.0

package/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

package/.idea/jsLinters/eslint.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EslintConfiguration">
+    <option name="fix-on-save" value="true" />
+  </component>
+</project>

package/.idea/modules.xml

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/redux-sacala.iml" filepath="$PROJECT_DIR$/.idea/redux-sacala.iml" />
-    </modules>
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/redux-sacala.iml" filepath="$PROJECT_DIR$/.idea/redux-sacala.iml" />
+    </modules>
+  </component>
 </project>

package/.idea/prettier.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PrettierConfiguration">
+    <option name="myConfigurationMode" value="AUTOMATIC" />
+    <option name="myRunOnSave" value="true" />
+  </component>
+</project>

package/.idea/redux-sacala.iml

@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
 </module>

package/.idea/vcs.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
 </project>

package/.idea/webResources.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WebResourcesPaths">
-    <contentEntries>
-      <entry url="file://$PROJECT_DIR$">
-        <entryData>
-          <resourceRoots>
-            <path value="file://$PROJECT_DIR$/src" />
-          </resourceRoots>
-        </entryData>
-      </entry>
-    </contentEntries>
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="WebResourcesPaths">
+    <contentEntries>
+      <entry url="file://$PROJECT_DIR$">
+        <entryData>
+          <resourceRoots>
+            <path value="file://$PROJECT_DIR$/src" />
+          </resourceRoots>
+        </entryData>
+      </entry>
+    </contentEntries>
+  </component>
 </project>

package/.prettierignore

@@ -0,0 +1,5 @@
+node_modules
+build
+dist
+coverage
+package-lock.json

package/.prettierrc

@@ -0,0 +1,8 @@
+{
+    "tabWidth": 4,
+    "useTabs": false,
+    "semi": true,
+    "singleQuote": false,
+    "trailingComma": "all",
+    "printWidth": 120
+}

package/README.md

@@ -0,0 +1,134 @@
+# redux-sacala
+
+A lightweight utility to create Redux blocks with minimal boilerplate, featuring type-safe actions, reducers, and side effects.
+
+## Features
+
+- **Minimal Boilerplate**: Define actions and reducers in one place.
+- **Type Safety**: Full TypeScript support for state and action payloads.
+- **Integrated Side Effects**: Middleware-based effects that have access to `dispatch` and `getState`.
+- **Ducks Pattern**: Encourages grouping related logic together.
+- **Extra Arguments**: Inject dependencies into your effects via middleware.
+
+## Installation
+
+```bash
+npm install redux-sacala
+```
+
+*Note: `redux` is a peer dependency.*
+
+## Usage Example
+
+### 1. Create a Redux Block
+
+```typescript
+import { createReduxBlock } from 'redux-sacala';
+
+interface CounterState {
+  count: number;
+}
+
+interface RootState {
+  counter: CounterState;
+}
+
+// Define the block
+const {
+  actions,
+  reducer,
+  createMiddleware
+} = createReduxBlock<RootState, { logger: (msg: string) => void }>()({
+  name: 'counter',
+  initial: { count: 0 },
+  actions: {
+    increment(state) {
+      return { count: state.count + 1 };
+    },
+    setCount(state, payload: number) {
+      return { count: payload };
+    }
+  },
+  effects: (dispatch, getState) => ({
+    asyncIncrement(payload: number, { logger }) {
+      logger('Starting async increment');
+      setTimeout(() => {
+        dispatch(actions.increment());
+        logger('Incremented');
+      }, payload);
+    }
+  })
+});
+
+export { actions, reducer, createMiddleware };
+```
+
+### 2. Configure the Store
+
+```typescript
+import { createStore, combineReducers, applyMiddleware } from 'redux';
+import { reducer, createMiddleware } from './counterBlock';
+
+const rootReducer = combineReducers({
+  counter: reducer
+});
+
+// Create middleware with extra argument
+const counterMiddleware = createMiddleware({
+  logger: (msg) => console.log(msg)
+});
+
+const store = createStore(
+  rootReducer,
+  applyMiddleware(counterMiddleware)
+);
+```
+
+### 3. Dispatch Actions
+
+```typescript
+// These are type-safe
+store.dispatch(actions.increment());
+store.dispatch(actions.setCount(10));
+store.dispatch(actions.asyncIncrement(1000)); // Delay of 1000ms
+```
+
+## API
+
+### `createReduxBlock<GlobalState, ExtraArgument = undefined>()(options)`
+
+Creates a Redux block. The double-call pattern is used for better TypeScript type inference.
+
+#### Options
+- `name`: `string`. The key under which the state is stored in the global state. Must match a key in `GlobalState`.
+- `initial`: `GlobalState[name]`. The initial state of the block.
+- `actions`: An object where each key is an action name and each value is a state handler: `(state: BlockState, payload: any) => BlockState`.
+- `effects`: (Optional) A function `(dispatch, getState) => effectsMap`.
+    - `effectsMap` keys are action types.
+    - `effectsMap` values are effect handlers: `(payload: any, extraArgument: ExtraArgument) => void`.
+
+#### Returns
+- `name`: The name of the block.
+- `reducer`: The Redux reducer for this block.
+- `actions`: An object containing action creators for both `actions` and `effects`.
+- `createMiddleware`: A function `(extraArgument: ExtraArgument) => Middleware` to create the Redux middleware for handling the effects.
+
+## Development
+
+```bash
+# Install dependencies
+npm install
+
+# Run tests
+npm test
+
+# Build the project
+npm run build
+
+# Lint the code
+npm run lint
+```
+
+## License
+
+Author: Andrey Monkin (monkin.andrey@gmail.com)

package/build/redux-sacala.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function a(r){const e={};for(const t in r)e[t]=r[t].bind(r);return e}function f(r,e){const t={};for(const c in e)t[r+c]=e[c];return t}function l(r){return e=>e===void 0?{type:r}:{type:r,payload:e}}function p(r){return e=>({type:r,payload:e})}function y(r,e,t){const c=f(r+"/",a(t));return(n=e,u)=>{if(u&&u.type){const o=c[u.type];return o?o(n,u.payload):n}else return n}}function C(r,e){return(t=>c=>{const n=f(r+"/",a(e(c.dispatch,c.getState)));return u=>o=>{o&&n.hasOwnProperty(o.type)?n[o.type](o.payload,t):u(o)}})}function s(){throw new Error("Can't have access to 'dispatch' and 'getState' during initialization")}function b(){return function({name:e,initial:t,actions:c,effects:n}){const u=Object.keys(c).reduce((d,i)=>(d[i]=l(`${e}/${i}`),d),{}),o=Object.keys(n?n(s,s):{}).reduce((d,i)=>(d[i]=p(`${e}/${i}`),d),{});return{name:e,reducer:y(e,t,c),createMiddleware:n?C(e,n):(()=>(d=>i=>i)),actions:{...u,...o}}}}exports.createReduxBlock=b;

package/build/redux-sacala.d.ts

@@ -1,33 +1,49 @@
-import { Dispatch, Action, Reducer, Middleware } from "redux";
-type UnknownToUndefined<T> = unknown extends T ? undefined : T;
-type FirstArgument<F> = F extends (arg1: infer U, ...args: any[]) => any ? UnknownToUndefined<U> : undefined;
-type SecondArgument<F> = F extends (arg1: any, arg2: infer U, ...args: any[]) => any ? UnknownToUndefined<U> : undefined;
-type ActionHandler<BlockState, Payload> = (state: BlockState, payload: Payload) => BlockState;
-type ActionMap<BlockState> = {
-    [action: string]: ActionHandler<BlockState, any>;
-};
-type EffectsMap<GlobalState, ExtraArgument> = (dispatch: Dispatch, getState: () => GlobalState) => {
-    [effect: string]: (payload: any, extraArgument: ExtraArgument) => any;
-};
-type ActionCreator<Handler extends ActionHandler<any, any>> = undefined extends SecondArgument<Handler> ? () => Action<string> : (payload: SecondArgument<Handler>) => (Action<string> & {
-    payload: SecondArgument<Handler>;
-});
-type ActionCreatorMap<Actions extends ActionMap<any>> = {
-    [name in keyof Actions]: ActionCreator<Actions[name]>;
-};
-type EffectsCreatorMap<GlobalState, ExtraArgument, Map extends EffectsMap<GlobalState, ExtraArgument>> = {
-    [key in keyof ReturnType<Map>]: (undefined extends FirstArgument<ReturnType<Map>[key]> ? () => Action : (payload: FirstArgument<ReturnType<Map>[key]>) => Action);
-};
-type MiddlewareCreator<T> = T extends undefined ? () => Middleware : (argument: T) => Middleware;
-export declare function createReduxBlock<GlobalState, ExtraArgument = undefined>(): <Name extends keyof GlobalState & string, Actions extends ActionMap<GlobalState[Name]>, Effects extends EffectsMap<GlobalState, ExtraArgument>>({ name, initial, actions, effects }: {
-    name: Name;
-    initial: GlobalState[Name];
-    actions: Actions;
-    effects?: Effects | undefined;
-}) => {
-    name: Name;
-    reducer: Reducer<GlobalState[Name]>;
-    createMiddleware: MiddlewareCreator<ExtraArgument>;
-    actions: ActionCreatorMap<Actions> & EffectsCreatorMap<GlobalState, ExtraArgument, Effects>;
-};
-export {};
+import { Action } from 'redux';
+import { Dispatch } from 'redux';
+import { Middleware } from 'redux';
+import { Reducer } from 'redux';
+
+declare type ActionCreator<Handler extends ActionHandler<any, any>> = undefined extends SecondArgument<Handler> ? () => Action<string> : (payload: SecondArgument<Handler>) => (Action<string> & {
+    payload: SecondArgument<Handler>;
+});
+
+declare type ActionCreatorMap<Actions extends ActionMap<any>> = {
+    [name in keyof Actions]: ActionCreator<Actions[name]>;
+};
+
+declare type ActionHandler<BlockState, Payload> = (state: BlockState, payload: Payload) => BlockState;
+
+declare type ActionMap<BlockState> = {
+    [action: string]: ActionHandler<BlockState, any>;
+};
+
+export declare function createReduxBlock<GlobalState, ExtraArgument = undefined>(): <Name extends (keyof GlobalState) & string, Actions extends ActionMap<GlobalState[Name]>, Effects extends EffectsMap<GlobalState, ExtraArgument>>({ name, initial, actions, effects }: {
+    name: Name;
+    initial: GlobalState[Name];
+    actions: Actions;
+    effects?: Effects;
+}) => {
+    name: Name;
+    reducer: Reducer<GlobalState[Name]>;
+    actions: ActionCreatorMap<Actions> & EffectsCreatorMap<GlobalState, ExtraArgument, Effects>;
+} & ({} extends ReturnType<Effects> ? {} : {
+    createMiddleware: MiddlewareCreator<ExtraArgument>;
+});
+
+declare type EffectsCreatorMap<GlobalState, ExtraArgument, Map extends EffectsMap<GlobalState, ExtraArgument>> = {
+    [key in keyof ReturnType<Map>]: (undefined extends FirstArgument<ReturnType<Map>[key]> ? () => Action : (payload: FirstArgument<ReturnType<Map>[key]>) => Action);
+};
+
+declare type EffectsMap<GlobalState, ExtraArgument> = (dispatch: Dispatch, getState: () => GlobalState) => {
+    [effect: string]: (payload: any, extraArgument: ExtraArgument) => any;
+};
+
+declare type FirstArgument<F> = F extends (arg1: infer U, ...args: any[]) => any ? UnknownToUndefined<U> : undefined;
+
+declare type MiddlewareCreator<T> = T extends undefined ? () => Middleware : (argument: T) => Middleware;
+
+declare type SecondArgument<F> = F extends (arg1: any, arg2: infer U, ...args: any[]) => any ? UnknownToUndefined<U> : undefined;
+
+declare type UnknownToUndefined<T> = unknown extends T ? undefined : T;
+
+export { }

package/build/redux-sacala.js

@@ -1,79 +1,56 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createReduxBlock = void 0;
-function bindAll(map) {
-    const result = {};
-    for (const i in map) {
-        result[i] = map[i].bind(map);
-    }
-    return result;
-}
-function appendPrefix(prefix, map) {
-    const r = {};
-    for (const i in map) {
-        r[prefix + i] = map[i];
-    }
-    return r;
-}
-// Transformation
-function createActionCreator(type) {
-    return (payload) => payload === undefined ? { type } : { type, payload };
-}
-function createEffectCreator(type) {
-    return (payload) => ({ type, payload });
-}
-function createReducer(prefix, initial, actionMap) {
-    const actions = appendPrefix(prefix + "/", bindAll(actionMap));
-    return (state = initial, action) => {
-        if (action && action.type) {
-            const handler = actions[action.type];
-            if (handler) {
-                return handler(state, action.payload);
-            }
-            else {
-                return state;
-            }
-        }
-        else {
-            return state;
-        }
+function f(e) {
+  const r = {};
+  for (const t in e)
+    r[t] = e[t].bind(e);
+  return r;
+}
+function a(e, r) {
+  const t = {};
+  for (const c in r)
+    t[e + c] = r[c];
+  return t;
+}
+function l(e) {
+  return (r) => r === void 0 ? { type: e } : { type: e, payload: r };
+}
+function p(e) {
+  return (r) => ({ type: e, payload: r });
+}
+function C(e, r, t) {
+  const c = a(e + "/", f(t));
+  return (n = r, u) => {
+    if (u && u.type) {
+      const o = c[u.type];
+      return o ? o(n, u.payload) : n;
+    } else
+      return n;
+  };
+}
+function h(e, r) {
+  return ((t) => (c) => {
+    const n = a(e + "/", f(r(c.dispatch, c.getState)));
+    return (u) => (o) => {
+      o && n.hasOwnProperty(o.type) ? n[o.type](o.payload, t) : u(o);
     };
-}
-function createMiddlewareCreator(prefix, effectsMap) {
-    return ((argument) => (store) => {
-        const effects = appendPrefix(prefix + "/", bindAll(effectsMap(store.dispatch, store.getState)));
-        return (next) => (action) => {
-            if (action && effects.hasOwnProperty(action.type)) {
-                effects[action.type](action.payload, argument);
-            }
-            else {
-                next(action);
-            }
-        };
-    });
-}
-function fail() {
-    throw new Error("Can't have access to 'dispatch' and 'getState' during initialization");
-}
-function createReduxBlock() {
-    return function applyConfig({ name, initial, actions, effects }) {
-        const actionCreators = Object.keys(actions).reduce((r, key) => {
-            r[key] = createActionCreator(`${name}/${key}`);
-            return r;
-        }, {});
-        const effectCreators = Object.keys(effects ? effects(fail, fail) : {}).reduce((r, key) => {
-            r[key] = createEffectCreator(`${name}/${key}`);
-            return r;
-        }, {});
-        return {
-            name,
-            reducer: createReducer(name, initial, actions),
-            createMiddleware: effects
-                ? createMiddlewareCreator(name, effects)
-                : (() => ((_) => (next) => next)),
-            actions: Object.assign(Object.assign({}, actionCreators), effectCreators)
-        };
+  });
+}
+function s() {
+  throw new Error("Can't have access to 'dispatch' and 'getState' during initialization");
+}
+function y() {
+  return function({ name: r, initial: t, actions: c, effects: n }) {
+    const u = Object.keys(c).reduce((d, i) => (d[i] = l(`${r}/${i}`), d), {}), o = Object.keys(n ? n(s, s) : {}).reduce((d, i) => (d[i] = p(`${r}/${i}`), d), {});
+    return {
+      name: r,
+      reducer: C(r, t, c),
+      createMiddleware: n ? h(r, n) : (() => ((d) => (i) => i)),
+      actions: {
+        ...u,
+        ...o
+      }
     };
+  };
 }
-exports.createReduxBlock = createReduxBlock;
-//# sourceMappingURL=redux-sacala.js.map
+export {
+  y as createReduxBlock
+};

package/eslint.config.js

@@ -0,0 +1,23 @@
+import eslint from "@eslint/js";
+import tseslint from "typescript-eslint";
+import prettierConfig from "eslint-config-prettier";
+
+export default tseslint.config(
+    eslint.configs.recommended,
+    ...tseslint.configs.recommended,
+    prettierConfig,
+    {
+        rules: {
+            "prefer-arrow-callback": "error",
+            "arrow-body-style": ["error", "as-needed"],
+            "func-style": ["error", "expression", { allowArrowFunctions: true }],
+            "@typescript-eslint/no-explicit-any": "off",
+            "@typescript-eslint/no-unsafe-function-type": "off",
+            "@typescript-eslint/no-empty-object-type": "off",
+            "@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_" }],
+        },
+    },
+    {
+        ignores: ["build/", "node_modules/", "coverage/"],
+    },
+);

package/package.json

@@ -1,26 +1,43 @@
 {
     "name": "redux-sacala",
-    "version": "0.0.18",
+    "version": "0.2.0",
+    "type": "module",
     "author": {
         "name": "Andrey Monkin",
         "email": "monkin.andrey@gmail.com"
     },
-    "main": "build/redux-sacala.js",
+    "module": "build/redux-sacala.js",
+    "main": "build/redux-sacala.cjs",
     "types": "build/redux-sacala.d.ts",
+    "exports": {
+        ".": {
+            "types": "./build/redux-sacala.d.ts",
+            "import": "./build/redux-sacala.js",
+            "require": "./build/redux-sacala.cjs"
+        }
+    },
     "peerDependencies": {
-        "redux": "^4.2.1"
+        "redux": "^5.0.1"
     },
     "devDependencies": {
-        "typescript": "5.1.3",
-        "jest": "29.5.0",
-        "@types/jest": "29.5.2",
-        "babel-jest": "29.5.0",
-        "@babel/core": "7.22.5",
-        "@babel/preset-env": "7.22.5",
-        "@babel/preset-typescript": "7.22.5"
+        "@eslint/js": "9.39.2",
+        "@types/node": "25.0.3",
+        "@typescript-eslint/eslint-plugin": "8.51.0",
+        "@typescript-eslint/parser": "8.51.0",
+        "eslint": "9.39.2",
+        "eslint-config-prettier": "10.1.8",
+        "prettier": "3.7.4",
+        "typescript": "5.9.3",
+        "typescript-eslint": "8.51.0",
+        "vite": "7.3.0",
+        "vite-plugin-dts": "4.5.4",
+        "vitest": "4.0.16"
     },
     "scripts": {
-        "prepublish": "jest src && tsc",
-        "test": "jest src"
+        "build": "vite build",
+        "prepublishOnly": "npm test && npm run build",
+        "test": "vitest run",
+        "lint": "eslint .",
+        "format": "prettier --write ."
     }
 }

package/src/redux-sacala.spec.ts

@@ -1,8 +1,4 @@
-import {
-    createStore,
-    combineReducers,
-    applyMiddleware,
-} from "redux";
+import { applyMiddleware, combineReducers, createStore } from "redux";
 import { createReduxBlock } from "./redux-sacala";
 
 interface LocalState {
@@ -26,37 +22,33 @@ const {
         },
         set(_, count: number) {
             return { count };
-        }
+        },
     },
-    effects: (dispatch, getState) => {
-        return {
-            incEffect() {
-                dispatch(local.inc());
-            }
-        };
-    }
+    effects: (dispatch) => ({
+        incEffect() {
+            dispatch(local.inc());
+        },
+    }),
 });
 
-function createMyStore() {
-    return createStore(combineReducers({
-        local: localReducer,
-    }), applyMiddleware(createLocalMiddleware(100)));
-}
-
-let store = createMyStore();
-
-beforeEach(() => {
-    store = createMyStore();
-});
+const createMyStore = () =>
+    createStore(
+        combineReducers({
+            local: localReducer,
+        }),
+        applyMiddleware(createLocalMiddleware(100)),
+    );
 
 describe("Store with reducer and middleware", () => {
     it("Should be updated on action without payload", () => {
+        const store = createMyStore();
         store.dispatch(local.inc());
         store.dispatch(local.inc());
         expect(store.getState()).toEqual({ local: { count: 2 } });
     });
 
     it("Should be updated on action with payload", () => {
+        const store = createMyStore();
         store.dispatch(local.set(12));
         expect(store.getState()).toEqual({ local: { count: 12 } });
     });

package/src/redux-sacala.ts

@@ -1,124 +1,132 @@
-import { Dispatch, Action, Reducer, Middleware, AnyAction, MiddlewareAPI } from "redux";
-
-type UnknownToUndefined<T> = unknown extends T ? undefined : T;
-
-type FirstArgument<F> = F extends (arg1: infer U, ...args: any[]) => any ? UnknownToUndefined<U> : undefined;
-type SecondArgument<F> = F extends (arg1: any, arg2: infer U, ...args: any[]) => any ? UnknownToUndefined<U> : undefined;
-
-function bindAll<T extends { [key: string]: Function }>(map: T): T {
-    const result = {} as any as T;
-    for (const i in map) {
-        result[i] = map[i].bind(map);
-    }
-    return result;
-}
-
-function appendPrefix<T>(prefix: string, map: { [key: string]: T }) {
-    const r: { [key: string]: any } = {};
-    for (const i in map) {
-        r[prefix + i] = map[i];
-    }
-    return r;
-}
-
-// Input
-type ActionHandler<BlockState, Payload> = (state: BlockState, payload: Payload) => BlockState;
-type ActionMap<BlockState> = { [action: string]: ActionHandler<BlockState, any> };
-type EffectsMap<GlobalState, ExtraArgument> = (dispatch: Dispatch, getState: () => GlobalState) => { [effect: string]: (payload: any, extraArgument: ExtraArgument) => any }
-
-// Output
-type ActionCreator<Handler extends ActionHandler<any, any>> = undefined extends SecondArgument<Handler>
-    ? () => Action<string>
-    : (payload: SecondArgument<Handler>) => (Action<string> & { payload: SecondArgument<Handler> });
-
-type ActionCreatorMap<Actions extends ActionMap<any>> = {
-    [name in keyof Actions]: ActionCreator<Actions[name]>;
-};
-
-type EffectsCreatorMap<GlobalState, ExtraArgument, Map extends EffectsMap<GlobalState, ExtraArgument>> = {
-    [key in keyof ReturnType<Map>]: (undefined extends FirstArgument<ReturnType<Map>[key]>
-        ? () => Action
-        : (payload: FirstArgument<ReturnType<Map>[key]>) => Action
-    );
-};
-
-// Transformation
-function createActionCreator(type: string) {
-    return (payload?: any) => payload === undefined ? { type } : { type, payload };
-}
-function createEffectCreator(type: string) {
-    return (payload: any) => ({ type, payload })
-}
-
-function createReducer<BlockState>(prefix: string, initial: BlockState, actionMap: ActionMap<BlockState>): Reducer {
-    const actions: ActionMap<BlockState> = appendPrefix(prefix + "/", bindAll(actionMap));
-    return (state: BlockState = initial, action?: AnyAction) => {
-        if (action && action.type) {
-            const handler: (state: BlockState, payload?: any) => BlockState = actions[action.type];
-            if (handler) {
-                return handler(state, action.payload);
-            } else {
-                return state;
-            }
-        } else {
-            return state;
-        }
-    }
-}
-
-type MiddlewareCreator<T> = T extends undefined ? () => Middleware : (argument: T) => Middleware;
-
-function createMiddlewareCreator<GlobalState, ExtraArgument>(prefix: string, effectsMap: EffectsMap<GlobalState, ExtraArgument>): MiddlewareCreator<ExtraArgument> {
-    return ((argument: ExtraArgument) => (store: MiddlewareAPI) => {
-        const effects = appendPrefix(prefix + "/", bindAll(effectsMap(store.dispatch, store.getState)));
-        return (next: Dispatch) => (action: Action<string> & { payload: any[] }) => {
-            if (action && effects.hasOwnProperty(action.type)) {
-                effects[action.type](action.payload, argument);
-            } else {
-                next(action);
-            }
-        };
-    }) as MiddlewareCreator<ExtraArgument>;
-}
-
-function fail(): never {
-    throw new Error("Can't have access to 'dispatch' and 'getState' during initialization");
-}
-
-export function createReduxBlock<GlobalState, ExtraArgument = undefined>() {
-    return function applyConfig<
-        Name extends (keyof GlobalState) & string,
-        Actions extends ActionMap<GlobalState[Name]>,
-        Effects extends EffectsMap<GlobalState, ExtraArgument>,
-    >({ name, initial, actions, effects }: {
-        name: Name;
-        initial: GlobalState[Name];
-        actions: Actions;
-        effects?: Effects;
-    }): {
-        name: Name;
-        reducer: Reducer<GlobalState[Name]>;
-        actions: ActionCreatorMap<Actions> & EffectsCreatorMap<GlobalState, ExtraArgument, Effects>;
-    } & ({} extends ReturnType<Effects> ? {} : { createMiddleware: MiddlewareCreator<ExtraArgument>; }) {
-        const actionCreators = Object.keys(actions).reduce((r, key) => {
-            r[key] = createActionCreator(`${name}/${key}`);
-            return r;
-        }, {} as any);
-        const effectCreators = Object.keys(effects ? effects(fail, fail) : {}).reduce((r, key) => {
-            r[key] = createEffectCreator(`${name}/${key}`);
-            return r;
-        }, {} as any);
-    
-        return {
-            name,
-            reducer: createReducer(name as string, initial, actions),
-            createMiddleware: effects
-                ? createMiddlewareCreator<GlobalState, ExtraArgument>(name as string, effects)
-                : (() => ((_: MiddlewareAPI) => (next: Dispatch) => next)) as MiddlewareCreator<ExtraArgument>,
-            actions: {
-                ...actionCreators,
-                ...effectCreators
-            }
-        };
-    }
-}
+import { Dispatch, Action, Reducer, Middleware, AnyAction, MiddlewareAPI } from "redux";
+
+type UnknownToUndefined<T> = unknown extends T ? undefined : T;
+
+type FirstArgument<F> = F extends (arg1: infer U, ...args: any[]) => any ? UnknownToUndefined<U> : undefined;
+type SecondArgument<F> = F extends (arg1: any, arg2: infer U, ...args: any[]) => any
+    ? UnknownToUndefined<U>
+    : undefined;
+
+const bindAll = <T extends { [key: string]: Function }>(map: T): T => {
+    const result = {} as any as T;
+    for (const i in map) {
+        result[i] = map[i].bind(map);
+    }
+    return result;
+};
+
+const appendPrefix = <T>(prefix: string, map: { [key: string]: T }) => {
+    const r: { [key: string]: any } = {};
+    for (const i in map) {
+        r[prefix + i] = map[i];
+    }
+    return r;
+};
+
+// Input
+type ActionHandler<BlockState, Payload> = (state: BlockState, payload: Payload) => BlockState;
+type ActionMap<BlockState> = { [action: string]: ActionHandler<BlockState, any> };
+type EffectsMap<GlobalState, ExtraArgument> = (
+    dispatch: Dispatch,
+    getState: () => GlobalState,
+) => { [effect: string]: (payload: any, extraArgument: ExtraArgument) => any };
+
+// Output
+type ActionCreator<Handler extends ActionHandler<any, any>> =
+    undefined extends SecondArgument<Handler>
+        ? () => Action<string>
+        : (payload: SecondArgument<Handler>) => Action<string> & { payload: SecondArgument<Handler> };
+
+type ActionCreatorMap<Actions extends ActionMap<any>> = {
+    [name in keyof Actions]: ActionCreator<Actions[name]>;
+};
+
+type EffectsCreatorMap<GlobalState, ExtraArgument, Map extends EffectsMap<GlobalState, ExtraArgument>> = {
+    [key in keyof ReturnType<Map>]: undefined extends FirstArgument<ReturnType<Map>[key]>
+        ? () => Action
+        : (payload: FirstArgument<ReturnType<Map>[key]>) => Action;
+};
+
+// Transformation
+const createActionCreator = (type: string) => (payload?: any) => (payload === undefined ? { type } : { type, payload });
+const createEffectCreator = (type: string) => (payload: any) => ({ type, payload });
+
+const createReducer = <BlockState>(prefix: string, initial: BlockState, actionMap: ActionMap<BlockState>): Reducer => {
+    const actions: ActionMap<BlockState> = appendPrefix(prefix + "/", bindAll(actionMap));
+    return (state: BlockState = initial, action?: AnyAction) => {
+        if (action && action.type) {
+            const handler: (state: BlockState, payload?: any) => BlockState = actions[action.type];
+            if (handler) {
+                return handler(state, action.payload);
+            } else {
+                return state;
+            }
+        } else {
+            return state;
+        }
+    };
+};
+
+type MiddlewareCreator<T> = T extends undefined ? () => Middleware : (argument: T) => Middleware;
+
+const createMiddlewareCreator = <GlobalState, ExtraArgument>(
+    prefix: string,
+    effectsMap: EffectsMap<GlobalState, ExtraArgument>,
+): MiddlewareCreator<ExtraArgument> =>
+    ((argument: ExtraArgument) => (store: MiddlewareAPI) => {
+        const effects = appendPrefix(prefix + "/", bindAll(effectsMap(store.dispatch, store.getState)));
+        return (next: Dispatch) => (action: Action<string> & { payload: any[] }) => {
+            if (action && Object.prototype.hasOwnProperty.call(effects, action.type)) {
+                effects[action.type](action.payload, argument);
+            } else {
+                next(action);
+            }
+        };
+    }) as MiddlewareCreator<ExtraArgument>;
+
+const fail = (): never => {
+    throw new Error("Can't have access to 'dispatch' and 'getState' during initialization");
+};
+
+export const createReduxBlock =
+    <GlobalState, ExtraArgument = undefined>() =>
+    <
+        Name extends keyof GlobalState & string,
+        Actions extends ActionMap<GlobalState[Name]>,
+        Effects extends EffectsMap<GlobalState, ExtraArgument>,
+    >({
+        name,
+        initial,
+        actions,
+        effects,
+    }: {
+        name: Name;
+        initial: GlobalState[Name];
+        actions: Actions;
+        effects?: Effects;
+    }): {
+        name: Name;
+        reducer: Reducer<GlobalState[Name]>;
+        actions: ActionCreatorMap<Actions> & EffectsCreatorMap<GlobalState, ExtraArgument, Effects>;
+    } & ({} extends ReturnType<Effects> ? {} : { createMiddleware: MiddlewareCreator<ExtraArgument> }) => {
+        const actionCreators = Object.keys(actions).reduce((r, key) => {
+            r[key] = createActionCreator(`${name}/${key}`);
+            return r;
+        }, {} as any);
+        const effectCreators = Object.keys(effects ? effects(fail, fail) : {}).reduce((r, key) => {
+            r[key] = createEffectCreator(`${name}/${key}`);
+            return r;
+        }, {} as any);
+
+        return {
+            name,
+            reducer: createReducer(name as string, initial, actions),
+            createMiddleware: effects
+                ? createMiddlewareCreator<GlobalState, ExtraArgument>(name as string, effects)
+                : ((() => (_: MiddlewareAPI) => (next: Dispatch) => next) as MiddlewareCreator<ExtraArgument>),
+            actions: {
+                ...actionCreators,
+                ...effectCreators,
+            },
+        };
+    };

package/tsconfig.json

@@ -1,15 +1,14 @@
-{
-    "compilerOptions": {
-        "strict": true,
-        "noImplicitAny": true,
-        "moduleResolution": "node",
-        "module": "commonjs",
-        "outDir": "build",
-        "sourceMap": true,
-        "declaration": true,
-        "target": "es2015"
-    },
-    "include": [
-        "src/*.ts"
-    ]
-}
+{
+    "compilerOptions": {
+        "strict": true,
+        "noImplicitAny": true,
+        "moduleResolution": "bundler",
+        "module": "ESNext",
+        "outDir": "build",
+        "sourceMap": true,
+        "declaration": true,
+        "target": "ESNext",
+        "types": ["vitest/globals"]
+    },
+    "include": ["src/*.ts"]
+}

package/vite.config.ts

@@ -0,0 +1,29 @@
+import { defineConfig } from "vitest/config";
+import dts from "vite-plugin-dts";
+import { resolve } from "path";
+
+export default defineConfig({
+    build: {
+        lib: {
+            entry: resolve(__dirname, "src/redux-sacala.ts"),
+            name: "ReduxSacala",
+            fileName: "redux-sacala",
+            formats: ["es", "cjs"],
+        },
+        outDir: "build",
+        rollupOptions: {
+            external: ["redux"],
+            output: {
+                globals: {
+                    redux: "Redux",
+                },
+            },
+        },
+    },
+    plugins: [dts({ rollupTypes: true })],
+    test: {
+        globals: true,
+        environment: "node",
+        exclude: ["**/node_modules/**", "**/build/**"],
+    },
+});

package/babel.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-    presets: [
-        ["@babel/preset-env", { targets: { node: "current" } }],
-        "@babel/preset-typescript"
-    ],
-};

package/build/redux-sacala.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"redux-sacala.js","sourceRoot":"","sources":["../src/redux-sacala.ts"],"names":[],"mappings":"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"}

package/build/redux-sacala.spec.d.ts

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

package/build/redux-sacala.spec.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const redux_1 = require("redux");
-const redux_sacala_1 = require("./redux-sacala");
-const { actions: local, reducer: localReducer, createMiddleware: createLocalMiddleware, } = (0, redux_sacala_1.createReduxBlock)()({
-    name: "local",
-    initial: { count: 0 },
-    actions: {
-        inc(state) {
-            return { count: state.count + 1 };
-        },
-        set(_, count) {
-            return { count };
-        }
-    },
-    effects: (dispatch, getState) => {
-        return {};
-    }
-});
-function createMyStore() {
-    return (0, redux_1.createStore)((0, redux_1.combineReducers)({
-        local: localReducer,
-    }), (0, redux_1.applyMiddleware)(createLocalMiddleware(100)));
-}
-let store = createMyStore();
-beforeEach(() => {
-    store = createMyStore();
-});
-describe("Store with reducer and middleware", () => {
-    it("Should be updated on action without payload", () => {
-        store.dispatch(local.inc());
-        store.dispatch(local.inc());
-        expect(store.getState()).toEqual({ local: { count: 2 } });
-    });
-    it("Should be updated on action with payload", () => {
-        store.dispatch(local.set(12));
-        expect(store.getState()).toEqual({ local: { count: 12 } });
-    });
-});
-//# sourceMappingURL=redux-sacala.spec.js.map

package/build/redux-sacala.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"redux-sacala.spec.js","sourceRoot":"","sources":["../src/redux-sacala.spec.ts"],"names":[],"mappings":";;AAAA,iCAKe;AACf,iDAAkD;AAUlD,MAAM,EACF,OAAO,EAAE,KAAK,EACd,OAAO,EAAE,YAAY,EACrB,gBAAgB,EAAE,qBAAqB,GAC1C,GAAG,IAAA,+BAAgB,GAAmB,CAAC;IACpC,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IACrB,OAAO,EAAE;QACL,GAAG,CAAC,KAAK;YACL,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;QACtC,CAAC;QACD,GAAG,CAAC,CAAC,EAAE,KAAa;YAChB,OAAO,EAAE,KAAK,EAAE,CAAC;QACrB,CAAC;KACJ;IACD,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;QAC5B,OAAO,EAEN,CAAC;IACN,CAAC;CACJ,CAAC,CAAC;AAEH,SAAS,aAAa;IAClB,OAAO,IAAA,mBAAW,EAAC,IAAA,uBAAe,EAAC;QAC/B,KAAK,EAAE,YAAY;KACtB,CAAC,EAAE,IAAA,uBAAe,EAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC;AAED,IAAI,KAAK,GAAG,aAAa,EAAE,CAAC;AAE5B,UAAU,CAAC,GAAG,EAAE;IACZ,KAAK,GAAG,aAAa,EAAE,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IAC/C,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACnD,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5B,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5B,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAChD,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}