@vanyamate/sec 0.0.9 → 0.1.1

package/README.md

@@ -2,6 +2,10 @@
 
 Tiny state manager
 
+```
+npm i @vanyamate/sec
+```
+
 ```typescript
 import { store, effect, combine } from './index';
 

package/index.d.ts

@@ -3,20 +3,22 @@ export type EffectEvent = 'onBefore' | 'onSuccess' | 'onError' | 'onFinally';
 export type Effect<Args extends any[], Result> = {
     (...args: Args): Promise<Result>;
     onSuccess: (callback: (result: Result, ...args: Args) => void) => void;
-    onError: (callback: (error: any, ...args: Args) => void) => void;
+    onError: (callback: (error: unknown, ...args: Args) => void) => void;
     onFinally: (callback: (...args: Args) => void) => void;
     onBefore: (callback: (...args: Args) => void) => void;
 };
 export type Listener<State> = (state: State) => void;
+export type Payload<Result, Args> = {
+    result?: Result;
+    error?: unknown;
+    args: Args;
+};
+export type Handler<State, Args, Result> = (state: State, payload: Payload<Result, Args>) => State;
 export declare function effect<Args extends any[], Result>(fn: EffectFunction<Args, Result>): Effect<Args, Result>;
 export type Store<State> = {
     get: () => State;
     set: (newState: State) => void;
-    on: <Args extends any[], Result>(effect: Effect<Args, Result>, event: EffectEvent, handler: (state: State, payload: {
-        result?: Result;
-        error?: any;
-        meta: Args;
-    }) => State) => Store<State>;
+    on: <Args extends any[], Result>(effect: Effect<Args, Result>, event: EffectEvent, handler: Handler<State, Args, Result>) => Store<State>;
     subscribe: (listener: Listener<State>) => () => void;
 };
 export declare function store<State>(initialState: State): Store<State>;

package/index.ts

@@ -4,20 +4,26 @@ export type EffectEvent = 'onBefore' | 'onSuccess' | 'onError' | 'onFinally';
 export type Effect<Args extends any[], Result> = {
     (...args: Args): Promise<Result>;
     onSuccess: (callback: (result: Result, ...args: Args) => void) => void;
-    onError: (callback: (error: any, ...args: Args) => void) => void;
+    onError: (callback: (error: unknown, ...args: Args) => void) => void;
     onFinally: (callback: (...args: Args) => void) => void;
     onBefore: (callback: (...args: Args) => void) => void;
 };
 
 export type Listener<State> = (state: State) => void;
+export type Payload<Result, Args> = {
+    result?: Result;
+    error?: unknown;
+    args: Args;
+};
+export type Handler<State, Args, Result> = (state: State, payload: Payload<Result, Args>) => State;
 
 export function effect<Args extends any[], Result> (fn: EffectFunction<Args, Result>): Effect<Args, Result> {
     let beforeListeners: ((...args: Args) => void)[]                  = [];
     let successListeners: ((result: Result, ...args: Args) => void)[] = [];
-    let errorListeners: ((error: any, ...args: Args) => void)[]       = [];
+    let errorListeners: ((error: unknown, ...args: Args) => void)[]   = [];
     let finallyListeners: ((...args: Args) => void)[]                 = [];
 
-    const wrappedEffect: any = async (...args: Args) => {
+    const wrappedEffect: Effect<Args, Result> = async (...args: Args) => {
         beforeListeners.forEach(listener => listener(...args));
         try {
             const result = await fn(...args);
@@ -39,7 +45,7 @@ export function effect<Args extends any[], Result> (fn: EffectFunction<Args, Res
         successListeners.push(callback);
     };
 
-    wrappedEffect.onError = (callback: (error: any, ...args: Args) => void) => {
+    wrappedEffect.onError = (callback: (error: unknown, ...args: Args) => void) => {
         errorListeners.push(callback);
     };
 
@@ -47,7 +53,7 @@ export function effect<Args extends any[], Result> (fn: EffectFunction<Args, Res
         finallyListeners.push(callback);
     };
 
-    return wrappedEffect as Effect<Args, Result>;
+    return wrappedEffect;
 }
 
 export type Store<State> = {
@@ -56,11 +62,7 @@ export type Store<State> = {
     on: <Args extends any[], Result>(
         effect: Effect<Args, Result>,
         event: EffectEvent,
-        handler: (state: State, payload: {
-            result?: Result;
-            error?: any;
-            meta: Args
-        }) => State,
+        handler: Handler<State, Args, Result>,
     ) => Store<State>;
     subscribe: (listener: Listener<State>) => () => void;
 };
@@ -78,29 +80,21 @@ export function store<State> (initialState: State): Store<State> {
     const on = <Args extends any[], Result> (
         effect: Effect<Args, Result>,
         event: EffectEvent,
-        handler: (state: State, payload: {
-            result?: Result;
-            error?: any;
-            meta: Args
-        }) => State,
+        handler: Handler<State, Args, Result>,
     ): Store<State> => {
-        const callback = (payload: {
-            result?: Result;
-            error?: any;
-            meta: Args
-        }) => set(handler(state, payload));
+        const callback = (payload: Payload<Result, Args>) => set(handler(state, payload));
 
         if (event === 'onBefore') {
-            effect.onBefore((...args) => callback({ meta: args }));
+            effect.onBefore((...args) => callback({ args }));
         } else if (event === 'onSuccess') {
             effect.onSuccess((result, ...args) => callback({
                 result,
-                meta: args,
+                args,
             }));
         } else if (event === 'onError') {
-            effect.onError((error, ...args) => callback({ error, meta: args }));
+            effect.onError((error, ...args) => callback({ error, args }));
         } else if (event === 'onFinally') {
-            effect.onFinally((...args) => callback({ meta: args }));
+            effect.onFinally((...args) => callback({ args }));
         }
 
         return storeApi;
@@ -108,7 +102,12 @@ export function store<State> (initialState: State): Store<State> {
 
     const subscribe = (listener: Listener<State>) => {
         listeners.push(listener);
-        return () => listeners = listeners.filter((l) => l !== listener);
+        return () => {
+            const index = listeners.indexOf(listener);
+            if (index !== -1) {
+                listeners.splice(index, 1);
+            }
+        };
     };
 
     const storeApi = {
@@ -127,7 +126,7 @@ export function combine<States extends any[], Result> (
 ): Store<Result> {
     let combinedState: Result = callback(...stores);
 
-    stores.forEach((store, index) => {
+    stores.forEach((store) => {
         store.subscribe(() => {
             combinedState = callback(...stores);
             listeners.forEach(listener => listener(combinedState));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vanyamate/sec",
-    "version": "0.0.9",
+    "version": "0.1.1",
     "description": "SEC. Store, Effect, Combine. Tiny state manager",
     "scripts": {
         "g:type": "tsc index.ts --declaration --emitDeclarationOnly"