@vanyamate/sec 0.2.0 → 0.2.2

package/README.md

@@ -46,7 +46,7 @@ const loginAction = async function (loginData: LoginData): Promise<UserData> {
 const loginEffect = effect(loginAction);
 
 // Anywhere in code
-loginEffect();
+loginEffect({ login: 'VanyaMate', password: 'qwerty12345' });
 
 ```
 
@@ -68,6 +68,8 @@ const logoutMarker = marker('afterAll').on('onSuccess', logoutEffect);
 
 ```
 
+order of execution: 'beforeAll' -> undefined -> 'afterAll' (within one type (for example `onSuccess`))
+
 ### to
 
 Just helper. Returns a function that returns the passed value.
@@ -78,10 +80,33 @@ to(123); // Return () => 123
 
 ```
 
+```typescript
+// before    .on(logoutEffect, 'onSuccess', () => []);
+// after     .on(logoutEffect, 'onSuccess', to([]));
+```
+
 ### pending
 
 Just helper. wrapper over store. returns a bool value and is used to create a pending-store.
 
+```typescript
+/**
+ *
+ * instead of
+ * const postsIsPending = store<boolean>(false)
+ *  .on(getPostsForUser, 'onBefore', () => true)
+ *  .on(getPostsForUser, 'onFinally', () => false)
+ *  .on(createPostEffect, 'onBefore', () => true)
+ *  .on(createPostEffect, 'onFinally', () => false);
+ *
+ */
+
+const postsIsPending = pending([
+    getPostsForUser,
+    createPostEffect,
+]);
+```
+
 ### store
 
 Store stores data and subscribes to effect.
@@ -172,21 +197,29 @@ const posts = store<Array<Post>>([])
 
 ### Types
 
-instead of writing everything in `.on` - you can take out the handlers separately, setting the required type for them. `StoreEffectEventMap` is a generic and takes 2 parameters, and then the type is selected.
+#### StoreHandlerMap
+
+instead of writing everything in `.on` - you can take out the handlers separately, setting the required type for them.
+`StoreHandlerMap` is a generic and takes 2 parameters, and then the type is selected.
+first is type of store value. second is action signature. and then select type of subscribe.
+
+```
+StoreHandlerMap<number, typeof getRandomId>['onSuccess']
+```
 
 ```typescript
 // Example:
 
 const getRandomId = async function () {
-  return { id: Math.random() };
+    return { id: Math.random() };
 };
 
 const getRandomEffect = effect(getRandomId);
 
 const handler: StoreHandlerMap<number, typeof getRandomId>['onSuccess'] = function (state, { result }) {
-  return result.id;
+    return result.id;
 };
 
 const num = store<number>(0)
-        .on(getRandomEffect, 'onSuccess', handler);
+    .on(getRandomEffect, 'onSuccess', handler);
 ```

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=function(s,o){s&&o()},A=function(s,o=!0){const c={on:(n,f,t)=>(f==="onBefore"?n.onBefore((...e)=>u(o,()=>s=t(s,{args:e}))):f==="onSuccess"?n.onSuccess((e,...r)=>u(o,()=>s=t(s,{result:e,args:r}))):f==="onError"?n.onError((e,...r)=>u(o,()=>s=t(s,{error:e,args:r}))):n.onFinally((...e)=>u(o,()=>s=t(s,{args:e}))),c),get(){return s},set(n){s=n},subscribe(n){return()=>{}},enableOn(n){return n.subscribe(()=>o=!1),c},disableOn(n){return n.subscribe(()=>()=>o=!0),c}};return c},h=function(){return{afterAll:[],beforeAll:[],other:[]}},E=function(s){const o=h(),c=h(),n=h(),f=h(),t=async function(...e){return o.beforeAll.forEach(r=>r(...e)),o.other.forEach(r=>r(...e)),o.afterAll.forEach(r=>r(...e)),s(...e).then(r=>(c.beforeAll.forEach(l=>l(r,...e)),c.other.forEach(l=>l(r,...e)),c.afterAll.forEach(l=>l(r,...e)),r)).catch(r=>{throw n.beforeAll.forEach(l=>l(r,...e)),n.other.forEach(l=>l(r,...e)),n.afterAll.forEach(l=>l(r,...e)),r}).finally(()=>{f.beforeAll.forEach(r=>r(...e)),f.other.forEach(r=>r(...e)),f.afterAll.forEach(r=>r(...e))})};return t.onBefore=(e,r)=>{switch(r){case"beforeAll":o.beforeAll.push(e);break;case"afterAll":o.afterAll.push(e);break;default:o.other.push(e)}},t.onSuccess=(e,r)=>{switch(r){case"beforeAll":c.beforeAll.push(e);break;case"afterAll":c.afterAll.push(e);break;default:c.other.push(e)}},t.onError=(e,r)=>{switch(r){case"beforeAll":n.beforeAll.push(e);break;case"afterAll":n.afterAll.push(e);break;default:n.other.push(e)}},t.onFinally=(e,r)=>{switch(r){case"beforeAll":f.beforeAll.push(e);break;case"afterAll":f.afterAll.push(e);break;default:f.other.push(e)}},t},i=function(s,o,c=!0){let n=o(...s);const f=[];s.forEach(e=>{e.subscribe(()=>{u(c,()=>{n=o(...s),f.forEach(r=>r(n))})})});const t={on:()=>{throw new Error("Cannot call 'on' on combined store")},get(){return n},set(){throw new Error("Cannot call 'set' on combined store")},subscribe(e){return f.push(e),()=>{const r=f.indexOf(e);~r&&f.splice(r,1)}},enableOn(e){return e.subscribe(()=>c=!1),t},disableOn(e){return e.subscribe(()=>c=!0),t}};return t},a=function(s){const o=[],c={on:(n,f)=>(n==="onBefore"?f.onBefore(()=>o.forEach(t=>t()),s):n==="onSuccess"?f.onSuccess(()=>o.forEach(t=>t()),s):n==="onError"?f.onError(()=>o.forEach(t=>t()),s):f.onFinally(()=>o.forEach(t=>t()),s),c),subscribe:n=>{o.push(n)}};return c},b=function(s){return()=>s},p=function(s){const o=A(!1);return s.forEach(c=>{o.on(c,"onBefore",b(!0)),o.on(c,"onFinally",b(!1))}),o};exports.combine=i;exports.effect=E;exports.enableCheck=u;exports.marker=a;exports.pending=p;exports.store=A;exports.to=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=function(o,c){o&&c()},b=function(o,c=!0){const f=[],t={on:(n,s,e)=>(s==="onBefore"?n.onBefore((...r)=>u(c,()=>{o=e(o,{args:r}),f.forEach(l=>l(o))})):s==="onSuccess"?n.onSuccess((r,...l)=>u(c,()=>{o=e(o,{result:r,args:l}),f.forEach(i=>i(o))})):s==="onError"?n.onError((r,...l)=>u(c,()=>{o=e(o,{error:r,args:l}),f.forEach(i=>i(o))})):n.onFinally((...r)=>u(c,()=>o=e(o,{args:r}))),t),get(){return o},set(n){o=n},subscribe(n){return f.push(n),()=>{const s=f.indexOf(n);~s&&f.splice(s,1)}},enableOn(n){return n.subscribe(()=>c=!0),t},disableOn(n){return n.subscribe(()=>c=!1),t}};return t},h=function(){return{afterAll:[],beforeAll:[],other:[]}},A=function(o){const c=h(),f=h(),t=h(),n=h(),s=async function(...e){return c.beforeAll.forEach(r=>r(...e)),c.other.forEach(r=>r(...e)),c.afterAll.forEach(r=>r(...e)),o(...e).then(r=>(f.beforeAll.forEach(l=>l(r,...e)),f.other.forEach(l=>l(r,...e)),f.afterAll.forEach(l=>l(r,...e)),r)).catch(r=>{throw t.beforeAll.forEach(l=>l(r,...e)),t.other.forEach(l=>l(r,...e)),t.afterAll.forEach(l=>l(r,...e)),r}).finally(()=>{n.beforeAll.forEach(r=>r(...e)),n.other.forEach(r=>r(...e)),n.afterAll.forEach(r=>r(...e))})};return s.onBefore=(e,r)=>{switch(r){case"beforeAll":c.beforeAll.push(e);break;case"afterAll":c.afterAll.push(e);break;default:c.other.push(e)}},s.onSuccess=(e,r)=>{switch(r){case"beforeAll":f.beforeAll.push(e);break;case"afterAll":f.afterAll.push(e);break;default:f.other.push(e)}},s.onError=(e,r)=>{switch(r){case"beforeAll":t.beforeAll.push(e);break;case"afterAll":t.afterAll.push(e);break;default:t.other.push(e)}},s.onFinally=(e,r)=>{switch(r){case"beforeAll":n.beforeAll.push(e);break;case"afterAll":n.afterAll.push(e);break;default:n.other.push(e)}},s},E=function(o,c,f=!0){let t=c(...o);const n=[];o.forEach(e=>{e.subscribe(()=>{u(f,()=>{t=c(...o),n.forEach(r=>r(t))})})});const s={on:()=>{throw new Error("Cannot call 'on' on combined store")},get(){return t},set(){throw new Error("Cannot call 'set' on combined store")},subscribe(e){return n.push(e),()=>{const r=n.indexOf(e);~r&&n.splice(r,1)}},enableOn(e){return e.subscribe(()=>f=!1),s},disableOn(e){return e.subscribe(()=>f=!0),s}};return s},p=function(o){const c=[],f={on:(t,n)=>(t==="onBefore"?n.onBefore(()=>c.forEach(s=>s()),o):t==="onSuccess"?n.onSuccess(()=>c.forEach(s=>s()),o):t==="onError"?n.onError(()=>c.forEach(s=>s()),o):n.onFinally(()=>c.forEach(s=>s()),o),f),subscribe:t=>{c.push(t)}};return f},a=function(o){return()=>o},k=function(o){const c=b(!1);return o.forEach(f=>{c.on(f,"onBefore",a(!0)),c.on(f,"onFinally",a(!1))}),c};exports.combine=E;exports.effect=A;exports.enableCheck=u;exports.marker=p;exports.pending=k;exports.store=b;exports.to=a;

package/dist/index.d.ts

@@ -50,7 +50,7 @@ export declare type Store<State> = {
     subscribe: (listener: StoreListener<State>) => () => void;
 };
 
-export declare const store: <State extends any>(initialData: State, enabled?: boolean) => Store<State>;
+export declare const store: <State extends any>(state: State, enabled?: boolean) => Store<State>;
 
 export declare type StoreEffectSubscribe<State> = <Action extends EffectAction, Event extends keyof StoreHandlerMap<State, Action>>(effect: Effect<Action>, event: Event, handler: StoreHandlerMap<State, Action>[Event]) => Store<State>;
 

package/dist/index.js

@@ -1,167 +1,175 @@
-const l = function(s, o) {
-  s && o();
-}, A = function(s, o = !0) {
-  const c = {
-    on: (n, f, t) => (f === "onBefore" ? n.onBefore(
-      (...e) => l(
-        o,
-        () => s = t(s, { args: e })
+const u = function(o, c) {
+  o && c();
+}, b = function(o, c = !0) {
+  const f = [], l = {
+    on: (n, s, r) => (s === "onBefore" ? n.onBefore(
+      (...e) => u(
+        c,
+        () => {
+          o = r(o, { args: e }), f.forEach((t) => t(o));
+        }
       )
-    ) : f === "onSuccess" ? n.onSuccess(
-      (e, ...r) => l(
-        o,
-        () => s = t(s, {
-          result: e,
-          args: r
-        })
+    ) : s === "onSuccess" ? n.onSuccess(
+      (e, ...t) => u(
+        c,
+        () => {
+          o = r(o, {
+            result: e,
+            args: t
+          }), f.forEach((i) => i(o));
+        }
       )
-    ) : f === "onError" ? n.onError(
-      (e, ...r) => l(
-        o,
-        () => s = t(s, {
-          error: e,
-          args: r
-        })
+    ) : s === "onError" ? n.onError(
+      (e, ...t) => u(
+        c,
+        () => {
+          o = r(o, {
+            error: e,
+            args: t
+          }), f.forEach((i) => i(o));
+        }
       )
     ) : n.onFinally(
-      (...e) => l(
-        o,
-        () => s = t(s, { args: e })
+      (...e) => u(
+        c,
+        () => o = r(o, { args: e })
       )
-    ), c),
+    ), l),
     get() {
-      return s;
+      return o;
     },
     set(n) {
-      s = n;
+      o = n;
     },
     subscribe(n) {
-      return () => {
+      return f.push(n), () => {
+        const s = f.indexOf(n);
+        ~s && f.splice(s, 1);
       };
     },
     enableOn(n) {
-      return n.subscribe(() => o = !1), c;
+      return n.subscribe(() => c = !0), l;
     },
     disableOn(n) {
-      return n.subscribe(() => () => o = !0), c;
+      return n.subscribe(() => c = !1), l;
     }
   };
-  return c;
+  return l;
 }, h = function() {
   return {
     afterAll: [],
     beforeAll: [],
     other: []
   };
-}, E = function(s) {
-  const o = h(), c = h(), n = h(), f = h(), t = async function(...e) {
-    return o.beforeAll.forEach((r) => r(...e)), o.other.forEach((r) => r(...e)), o.afterAll.forEach((r) => r(...e)), s(...e).then((r) => (c.beforeAll.forEach((u) => u(r, ...e)), c.other.forEach((u) => u(r, ...e)), c.afterAll.forEach((u) => u(r, ...e)), r)).catch((r) => {
-      throw n.beforeAll.forEach((u) => u(r, ...e)), n.other.forEach((u) => u(r, ...e)), n.afterAll.forEach((u) => u(r, ...e)), r;
+}, A = function(o) {
+  const c = h(), f = h(), l = h(), n = h(), s = async function(...r) {
+    return c.beforeAll.forEach((e) => e(...r)), c.other.forEach((e) => e(...r)), c.afterAll.forEach((e) => e(...r)), o(...r).then((e) => (f.beforeAll.forEach((t) => t(e, ...r)), f.other.forEach((t) => t(e, ...r)), f.afterAll.forEach((t) => t(e, ...r)), e)).catch((e) => {
+      throw l.beforeAll.forEach((t) => t(e, ...r)), l.other.forEach((t) => t(e, ...r)), l.afterAll.forEach((t) => t(e, ...r)), e;
     }).finally(() => {
-      f.beforeAll.forEach((r) => r(...e)), f.other.forEach((r) => r(...e)), f.afterAll.forEach((r) => r(...e));
+      n.beforeAll.forEach((e) => e(...r)), n.other.forEach((e) => e(...r)), n.afterAll.forEach((e) => e(...r));
     });
   };
-  return t.onBefore = (e, r) => {
-    switch (r) {
+  return s.onBefore = (r, e) => {
+    switch (e) {
       case "beforeAll":
-        o.beforeAll.push(e);
+        c.beforeAll.push(r);
         break;
       case "afterAll":
-        o.afterAll.push(e);
+        c.afterAll.push(r);
         break;
       default:
-        o.other.push(e);
+        c.other.push(r);
     }
-  }, t.onSuccess = (e, r) => {
-    switch (r) {
+  }, s.onSuccess = (r, e) => {
+    switch (e) {
       case "beforeAll":
-        c.beforeAll.push(e);
+        f.beforeAll.push(r);
         break;
       case "afterAll":
-        c.afterAll.push(e);
+        f.afterAll.push(r);
         break;
       default:
-        c.other.push(e);
+        f.other.push(r);
     }
-  }, t.onError = (e, r) => {
-    switch (r) {
+  }, s.onError = (r, e) => {
+    switch (e) {
       case "beforeAll":
-        n.beforeAll.push(e);
+        l.beforeAll.push(r);
         break;
       case "afterAll":
-        n.afterAll.push(e);
+        l.afterAll.push(r);
         break;
       default:
-        n.other.push(e);
+        l.other.push(r);
     }
-  }, t.onFinally = (e, r) => {
-    switch (r) {
+  }, s.onFinally = (r, e) => {
+    switch (e) {
       case "beforeAll":
-        f.beforeAll.push(e);
+        n.beforeAll.push(r);
         break;
       case "afterAll":
-        f.afterAll.push(e);
+        n.afterAll.push(r);
         break;
       default:
-        f.other.push(e);
+        n.other.push(r);
     }
-  }, t;
-}, a = function(s, o, c = !0) {
-  let n = o(...s);
-  const f = [];
-  s.forEach((e) => {
-    e.subscribe(() => {
-      l(c, () => {
-        n = o(...s), f.forEach((r) => r(n));
+  }, s;
+}, E = function(o, c, f = !0) {
+  let l = c(...o);
+  const n = [];
+  o.forEach((r) => {
+    r.subscribe(() => {
+      u(f, () => {
+        l = c(...o), n.forEach((e) => e(l));
       });
     });
   });
-  const t = {
+  const s = {
     on: () => {
       throw new Error("Cannot call 'on' on combined store");
     },
     get() {
-      return n;
+      return l;
     },
     set() {
       throw new Error("Cannot call 'set' on combined store");
     },
-    subscribe(e) {
-      return f.push(e), () => {
-        const r = f.indexOf(e);
-        ~r && f.splice(r, 1);
+    subscribe(r) {
+      return n.push(r), () => {
+        const e = n.indexOf(r);
+        ~e && n.splice(e, 1);
       };
     },
-    enableOn(e) {
-      return e.subscribe(() => c = !1), t;
+    enableOn(r) {
+      return r.subscribe(() => f = !1), s;
     },
-    disableOn(e) {
-      return e.subscribe(() => c = !0), t;
+    disableOn(r) {
+      return r.subscribe(() => f = !0), s;
     }
   };
-  return t;
-}, i = function(s) {
-  const o = [], c = {
-    on: (n, f) => (n === "onBefore" ? f.onBefore(() => o.forEach((t) => t()), s) : n === "onSuccess" ? f.onSuccess(() => o.forEach((t) => t()), s) : n === "onError" ? f.onError(() => o.forEach((t) => t()), s) : f.onFinally(() => o.forEach((t) => t()), s), c),
-    subscribe: (n) => {
-      o.push(n);
+  return s;
+}, p = function(o) {
+  const c = [], f = {
+    on: (l, n) => (l === "onBefore" ? n.onBefore(() => c.forEach((s) => s()), o) : l === "onSuccess" ? n.onSuccess(() => c.forEach((s) => s()), o) : l === "onError" ? n.onError(() => c.forEach((s) => s()), o) : n.onFinally(() => c.forEach((s) => s()), o), f),
+    subscribe: (l) => {
+      c.push(l);
     }
   };
-  return c;
-}, b = function(s) {
-  return () => s;
-}, p = function(s) {
-  const o = A(!1);
-  return s.forEach((c) => {
-    o.on(c, "onBefore", b(!0)), o.on(c, "onFinally", b(!1));
-  }), o;
+  return f;
+}, a = function(o) {
+  return () => o;
+}, w = function(o) {
+  const c = b(!1);
+  return o.forEach((f) => {
+    c.on(f, "onBefore", a(!0)), c.on(f, "onFinally", a(!1));
+  }), c;
 };
 export {
-  a as combine,
-  E as effect,
-  l as enableCheck,
-  i as marker,
-  p as pending,
-  A as store,
-  b as to
+  E as combine,
+  A as effect,
+  u as enableCheck,
+  p as marker,
+  w as pending,
+  b as store,
+  a as to
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vanyamate/sec",
-    "version": "0.2.0",
+    "version": "0.2.2",
     "description": "SEC. Store, Effect, Combine. Tiny state manager",
     "scripts": {
         "build": "vite build",

package/src/store/index.ts

@@ -52,7 +52,7 @@ export const enableCheck = function (enabled: boolean, callback: () => void) {
     }
 };
 
-export const store = function <State extends any> (initialData: State, enabled: boolean = true): Store<State> {
+export const store = function <State extends any> (state: State, enabled: boolean = true): Store<State> {
     const listeners: Array<StoreListener<State>> = [];
 
     const storeApi: Store<State> = {
@@ -64,32 +64,41 @@ export const store = function <State extends any> (initialData: State, enabled:
                 effect.onBefore((...args) =>
                     enableCheck(
                         enabled,
-                        () => initialData = (handler as StoreOnBeforeHandler<State, Action>)(initialData, { args }),
+                        () => {
+                            state = (handler as StoreOnBeforeHandler<State, Action>)(state, { args });
+                            listeners.forEach((listener) => listener(state));
+                        },
                     ),
                 );
             } else if (event === 'onSuccess') {
                 effect.onSuccess((result, ...args) =>
                     enableCheck(
                         enabled,
-                        () => initialData = (handler as StoreOnSuccessHandler<State, Action>)(initialData, {
-                            result, args,
-                        }),
+                        () => {
+                            state = (handler as StoreOnSuccessHandler<State, Action>)(state, {
+                                result, args,
+                            });
+                            listeners.forEach((listener) => listener(state));
+                        },
                     ),
                 );
             } else if (event === 'onError') {
                 effect.onError((error, ...args) =>
                     enableCheck(
                         enabled,
-                        () => initialData = (handler as StoreOnErrorHandler<State, Action>)(initialData, {
-                            error, args,
-                        }),
+                        () => {
+                            state = (handler as StoreOnErrorHandler<State, Action>)(state, {
+                                error, args,
+                            });
+                            listeners.forEach((listener) => listener(state));
+                        },
                     ),
                 );
             } else {
                 effect.onFinally((...args) =>
                     enableCheck(
                         enabled,
-                        () => initialData = (handler as StoreOnFinallyHandler<State, Action>)(initialData, { args }),
+                        () => state = (handler as StoreOnFinallyHandler<State, Action>)(state, { args }),
                     ),
                 );
             }
@@ -97,10 +106,10 @@ export const store = function <State extends any> (initialData: State, enabled:
             return storeApi;
         },
         get (): State {
-            return initialData;
+            return state;
         },
         set (value: State) {
-            initialData = value;
+            state = value;
         },
         subscribe (listener: StoreListener<State>) {
             listeners.push(listener);
@@ -112,11 +121,11 @@ export const store = function <State extends any> (initialData: State, enabled:
             };
         },
         enableOn (marker: Marker<State>) {
-            marker.subscribe(() => enabled = false);
+            marker.subscribe(() => enabled = true);
             return storeApi;
         },
         disableOn (marker: Marker<State>) {
-            marker.subscribe(() => () => enabled = true);
+            marker.subscribe(() => enabled = false);
             return storeApi;
         },
     };