chain-store 0.0.2 → 0.0.3

package/README.md

@@ -44,9 +44,9 @@ const squareRoot = setNumber.filter((n: number) => n >= 0).map(Math.sqrt)
 
 
 All actions in a chain are connected, and triggering any of them will trigger 
-the others. Each action triggers in the order in which it was chained. Subscriptions 
+the others. Each action triggers in the order of chaining. Subscriptions 
 fire after all callbacks for that action have resolved, so asynchronous callbacks 
-can make the process take longer.
+will take longer to process.
 
 ```ts
 /* Subscribe to see the output */

package/dist/index.es.js

@@ -1,201 +1,165 @@
-const O = () => w([]), k = (c) => {
-  const t = [], r = [], i = b();
-  let n = [], s = !1, e = c;
-  const a = (o) => {
-    var l, p;
-    const d = t.findIndex(([h]) => h === o);
-    d >= 0 && ((p = (l = t[d]) == null ? void 0 : l[1]) == null || p.dispose(), t.splice(d, 1));
-  }, u = {
-    on: (o, d) => (a(o), t.push([
-      o,
-      o.watch((...l) => {
-        s = !0;
-        const p = r.map(([m]) => m(e)), h = d(e, ...l);
-        h !== e && (e = h, i.emit("watch")(e)), r.forEach(([m, P], j) => {
-          const y = m(e);
-          y !== (p == null ? void 0 : p[j]) && P(y);
-        }), s = !1, n.forEach((m) => m()), n = [];
+const B = () => j(), C = (n) => {
+  const e = [], o = [];
+  let r = {}, u = [], t = !1, s = n;
+  const d = (c) => {
+    var a;
+    return (a = y(e, void 0, (h) => h[0] === c)) == null ? void 0 : a[1].dispose();
+  }, g = {
+    on: (c, a) => (d(c), e.push([
+      c,
+      c.watch((...h) => {
+        var f;
+        t = !0;
+        const i = o.map(([b]) => b(s)), l = a(s, ...h);
+        l !== s && (s = l, (f = r.emit) == null || f.call(r, s)), o.forEach(([b, w], x) => {
+          const A = b(s);
+          A !== (i == null ? void 0 : i[x]) && w(A);
+        }), t = !1, u.forEach((b) => b()), u = [];
       })
-    ]), u),
-    off: (o) => (a(o), u),
-    map: (o) => ({
-      getState: () => o(e),
-      watch: (d) => (r.push([o, d]), {
+    ]), g),
+    off: (c) => (d(c), g),
+    map: (c) => ({
+      getState: () => c(s),
+      watch: (a) => (o.push([c, a]), {
         dispose: () => {
-          const l = () => {
-            const p = r.findIndex(
-              (h) => h[0] === o && h[1] === d
-            );
-            p >= 0 && r.splice(p, 1);
-          };
-          if (s) return n.push(l);
-          l();
+          const h = () => y(
+            o,
+            void 0,
+            ([i, l]) => i === c && l === a
+          );
+          t ? u.push(h) : h();
         }
       })
     }),
-    getState: () => e,
-    watch: (o) => {
-      i.init("watch").watch(o);
-    }
+    getState: () => s,
+    watch: S(r)
   };
-  return u;
-}, w = (c, t) => {
-  const r = b(), i = (e) => {
-    r.emit("watch")(e);
-  }, n = (e) => {
+  return g;
+}, j = (n, e, o, r) => {
+  let u = {};
+  const t = [], s = (c, a) => {
+    var h;
+    (h = u.emit) == null || h.call(u, c), t.forEach((i) => i(c, a));
+  }, d = (c, a) => {
     try {
-      S(i, t)(e);
+      if (o) return q(c, o, (h) => s(h, a));
+      if (r)
+        return q(
+          c,
+          r,
+          (h) => h && s(c, a)
+        );
+      s(c, a);
     } catch {
     }
   };
-  return c.push(n), Object.assign((e) => {
-    c.forEach((a) => a(e));
+  return e == null || e(d), Object.assign((c) => {
+    (n ?? d)(c);
   }, {
-    ...r.init("watch"),
-    map: (e) => w(c, {
-      map: t != null && t.filter || t != null && t.map ? S(e, t, !0) : e
-    }),
-    filter: (e) => w(c, {
-      ...t,
-      filter: t != null && t.filter ? x(e, t.filter) : e
-    }),
-    target: (e, a) => t != null && t.filter ? E(c, {
-      map: async (u) => {
-        const o = t != null && t.map ? await t.map(u) : u;
-        if (!await t.filter(
-          o
-        )) throw new Error();
-        return o;
-      },
-      target: e,
-      options: a
-    }) : E(c, {
-      map: t == null ? void 0 : t.map,
-      target: e,
-      options: a
-    })
+    watch: S(u),
+    map: (c) => j(n ?? d, E(t), c),
+    filter: (c) => j(n ?? d, E(t), void 0, c),
+    target: (c, a) => K(
+      n ?? d,
+      E(t),
+      c,
+      a
+    )
   });
-}, E = (c, t) => {
-  const r = b(), i = [], n = async (a, u) => {
-    var p;
-    const o = t.target(a);
-    if (!(o instanceof Promise)) {
-      r.emit("watch")(a), r.emit("done")(o, a), u == null || u.done(o, a);
+}, K = (n, e, o, r) => {
+  let u = {}, t = {}, s = {}, d = {};
+  const g = [], c = async (i, l) => {
+    var x, A, O, P, D, m;
+    const f = o(i);
+    if (!(f instanceof Promise)) {
+      (x = u.emit) == null || x.call(u, i), (A = t.emit) == null || A.call(t, f, i), l == null || l.done(f, i);
       return;
     }
-    const d = i.includes(o), l = ((p = t.options) == null ? void 0 : p.skipDuplicates) !== !1;
-    !d && l && i.push(o), (!d || !l) && r.emit("watch")(a), window.requestAnimationFrame(async () => {
-      try {
-        const h = await o;
-        (!d || !l) && r.emit("done")(h, a), u == null || u.done(h, a);
-      } catch (h) {
-        (!d || !l) && r.emit("fail")(h, a), u == null || u.fail(h, a);
-      } finally {
-        if (!d || !l)
-          r.emit("finally")(a);
-        else {
-          const h = i.findIndex((m) => m === o);
-          h >= 0 && i.splice(h, 1);
-        }
-        u == null || u.finish(a);
-      }
-    });
-  }, s = async (a, u) => {
-    if (!t.map) return await n(a, u);
+    const b = g.includes(f), w = (r == null ? void 0 : r.skipDuplicates) !== !1;
+    !b && w && g.push(f), (!b || !w) && ((O = u.emit) == null || O.call(u, i));
     try {
-      const o = await t.map(a);
-      await n(o, u);
-    } catch {
+      const p = await f;
+      (!b || !w) && ((P = t.emit) == null || P.call(t, p, i)), l == null || l.done(p, i);
+    } catch (p) {
+      (!b || !w) && ((D = s.emit) == null || D.call(s, p, i)), l == null || l.fail(p, i);
+    } finally {
+      !b || !w ? (m = d.emit) == null || m.call(d, i) : window.requestAnimationFrame(() => {
+        y(g, f);
+      }), l == null || l.finish(i);
     }
   };
-  return c.push(s), Object.assign((a) => {
-    const { events: u, methods: o } = A();
-    return c.forEach((d) => {
-      s === d ? s(a, u) : d(a);
-    }), o;
+  return e(async (i, l) => {
+    try {
+      await c(i, l);
+    } catch {
+    }
+  }), Object.assign((i) => {
+    const { events: l, methods: f } = I();
+    return n(i, l), f;
   }, {
-    ...r.init("watch"),
-    done: r.init("done"),
-    fail: r.init("fail"),
-    finish: r.init("finish")
+    watch: S(u),
+    done: { watch: S(t) },
+    fail: { watch: S(s) },
+    finish: { watch: S(d) }
   });
-}, x = (c, t, r) => (i) => {
-  const n = (t == null ? void 0 : t(i)) ?? !0, s = (e) => {
-    if (!e && r) throw new Error();
-    return e && c(i);
-  };
-  return n instanceof Promise ? n.then(s) : s(n);
-}, S = (c, t, r) => (i) => {
-  var s;
-  const n = ((s = t == null ? void 0 : t.map) == null ? void 0 : s.call(t, i)) ?? i;
-  return n instanceof Promise ? n.then(x(c, t == null ? void 0 : t.filter, r)).catch(() => {
-    if (r) throw new Error();
-    return !1;
-  }) : x(c, t == null ? void 0 : t.filter, r)(n);
-}, A = (c) => {
-  const t = {}, r = c ?? {
+}, q = (n, e, o) => {
+  if (!e) return o(n);
+  const r = e(n);
+  if (!(r instanceof Promise)) return o(r);
+  r.then(o).catch(() => {
+  });
+}, F = ["done", "fail", "finish"], I = (n) => {
+  const e = {}, o = n ?? {
     state: "pending",
-    stored: {},
-    set: (s) => {
-      r.state = s;
-    },
-    controller: new I(() => r.state)
-  }, i = {
-    done: (s, e) => {
-      var a;
-      r.stored.result = s, r.set("done"), (a = t.done) == null || a.call(t, s, e);
-    },
-    fail: (s, e) => {
-      var a;
-      r.stored.error = s, r.set("fail"), (a = t.fail) == null || a.call(t, s, e);
-    },
-    finish: (s) => {
-      var e;
-      r.stored.params = s, (e = t.finish) == null || e.call(t, s);
-    }
-  }, n = (s, ...e) => t[s] ? void 0 : (a) => (t[s] = a, r.state !== "pending" && a(...e.map((u) => r.stored[u])), A(r).methods);
+    stored: [],
+    set: (t) => o.state = t,
+    controller: new z(() => o.state)
+  }, r = F.reduce(
+    (t, s, d) => ({
+      ...t,
+      [s]: (g, c) => {
+        var a;
+        o.stored[d] = g, d < 2 && o.set(s), (a = e[s]) == null || a.call(e, g, c);
+      }
+    }),
+    {}
+  ), u = (t, s) => ({
+    [t]: e[t] ? void 0 : (d) => (e[t] = d, o.state !== "pending" && //@ts-expect-error
+    d(o.stored[s], s < 2 ? o.stored[2] : void 0), I(o).methods)
+  });
   return {
-    events: i,
-    methods: Object.assign(r.controller, {
-      done: n("done", "result", "params"),
-      fail: n("fail", "error", "params"),
-      finish: n("finish", "params")
-    })
+    events: r,
+    methods: Object.assign(
+      o.controller,
+      F.reduce(
+        (t, s, d) => ({
+          ...t,
+          ...u(s, d)
+        }),
+        {}
+      )
+    )
   };
 };
-class I {
-  constructor(t) {
-    this.getState = t;
+class z {
+  constructor(e) {
+    this.getState = e;
   }
   get state() {
     return this.getState();
   }
 }
-const b = () => {
-  const c = {}, t = (i, n) => {
-    var s;
-    (s = c[i]) != null && s.includes(n) && (c[i] = c[i].filter(
-      (e) => e !== n
-    ));
-  }, r = (i, n) => {
-    var s;
-    (s = c[i]) != null && s.includes(n) || (c[i] = [...c[i] ?? [], n]);
-  };
-  return {
-    init: (i) => ({
-      watch: (n) => (r(i, n), {
-        dispose: () => t(i, n)
-      })
-    }),
-    emit: (i) => (...n) => {
-      var s;
-      (s = c[i]) == null || s.forEach(
-        (e) => e(...n)
-      );
-    }
-  };
+const E = (n) => (e) => n.push(e), y = (n, e, o) => {
+  const r = n.findIndex(o ?? ((u) => e === u));
+  return r >= 0 ? n.splice(r, 1)[0] : void 0;
+}, S = (n) => (e) => {
+  if (n != null && n.watch) return n.watch(e);
+  const o = [], r = (t) => y(o, t), u = (t) => !o.includes(t) && o.push(t);
+  return n.watch = (t) => (u(t), {
+    dispose: () => r(t)
+  }), n.emit = (...t) => o.forEach((s) => s(...t)), n.watch(e);
 };
 export {
-  O as createAction,
-  k as createStore
+  B as createAction,
+  C as createStore
 };

package/dist/index.umd.js

@@ -1 +1 @@
-(function(m,b){typeof exports=="object"&&typeof module<"u"?b(exports):typeof define=="function"&&define.amd?define(["exports"],b):(m=typeof globalThis<"u"?globalThis:m||self,b(m["chain-store"]={}))})(this,function(m){"use strict";const b=()=>y([]),P=c=>{const t=[],r=[],a=S();let i=[],s=!1,e=c;const n=o=>{var l,p;const d=t.findIndex(([h])=>h===o);d>=0&&((p=(l=t[d])==null?void 0:l[1])==null||p.dispose(),t.splice(d,1))},u={on:(o,d)=>(n(o),t.push([o,o.watch((...l)=>{s=!0;const p=r.map(([w])=>w(e)),h=d(e,...l);h!==e&&(e=h,a.emit("watch")(e)),r.forEach(([w,I],T)=>{const j=w(e);j!==(p==null?void 0:p[T])&&I(j)}),s=!1,i.forEach(w=>w()),i=[]})]),u),off:o=>(n(o),u),map:o=>({getState:()=>o(e),watch:d=>(r.push([o,d]),{dispose:()=>{const l=()=>{const p=r.findIndex(h=>h[0]===o&&h[1]===d);p>=0&&r.splice(p,1)};if(s)return i.push(l);l()}})}),getState:()=>e,watch:o=>{a.init("watch").watch(o)}};return u},y=(c,t)=>{const r=S(),a=e=>{r.emit("watch")(e)},i=e=>{try{f(a,t)(e)}catch{}};return c.push(i),Object.assign(e=>{c.forEach(n=>n(e))},{...r.init("watch"),map:e=>y(c,{map:t!=null&&t.filter||t!=null&&t.map?f(e,t,!0):e}),filter:e=>y(c,{...t,filter:t!=null&&t.filter?x(e,t.filter):e}),target:(e,n)=>t!=null&&t.filter?E(c,{map:async u=>{const o=t!=null&&t.map?await t.map(u):u;if(!await t.filter(o))throw new Error;return o},target:e,options:n}):E(c,{map:t==null?void 0:t.map,target:e,options:n})})},E=(c,t)=>{const r=S(),a=[],i=async(n,u)=>{var p;const o=t.target(n);if(!(o instanceof Promise)){r.emit("watch")(n),r.emit("done")(o,n),u==null||u.done(o,n);return}const d=a.includes(o),l=((p=t.options)==null?void 0:p.skipDuplicates)!==!1;!d&&l&&a.push(o),(!d||!l)&&r.emit("watch")(n),window.requestAnimationFrame(async()=>{try{const h=await o;(!d||!l)&&r.emit("done")(h,n),u==null||u.done(h,n)}catch(h){(!d||!l)&&r.emit("fail")(h,n),u==null||u.fail(h,n)}finally{if(!d||!l)r.emit("finally")(n);else{const h=a.findIndex(w=>w===o);h>=0&&a.splice(h,1)}u==null||u.finish(n)}})},s=async(n,u)=>{if(!t.map)return await i(n,u);try{const o=await t.map(n);await i(o,u)}catch{}};return c.push(s),Object.assign(n=>{const{events:u,methods:o}=A();return c.forEach(d=>{s===d?s(n,u):d(n)}),o},{...r.init("watch"),done:r.init("done"),fail:r.init("fail"),finish:r.init("finish")})},x=(c,t,r)=>a=>{const i=(t==null?void 0:t(a))??!0,s=e=>{if(!e&&r)throw new Error;return e&&c(a)};return i instanceof Promise?i.then(s):s(i)},f=(c,t,r)=>a=>{var s;const i=((s=t==null?void 0:t.map)==null?void 0:s.call(t,a))??a;return i instanceof Promise?i.then(x(c,t==null?void 0:t.filter,r)).catch(()=>{if(r)throw new Error;return!1}):x(c,t==null?void 0:t.filter,r)(i)},A=c=>{const t={},r=c??{state:"pending",stored:{},set:s=>{r.state=s},controller:new O(()=>r.state)},a={done:(s,e)=>{var n;r.stored.result=s,r.set("done"),(n=t.done)==null||n.call(t,s,e)},fail:(s,e)=>{var n;r.stored.error=s,r.set("fail"),(n=t.fail)==null||n.call(t,s,e)},finish:s=>{var e;r.stored.params=s,(e=t.finish)==null||e.call(t,s)}},i=(s,...e)=>t[s]?void 0:n=>(t[s]=n,r.state!=="pending"&&n(...e.map(u=>r.stored[u])),A(r).methods);return{events:a,methods:Object.assign(r.controller,{done:i("done","result","params"),fail:i("fail","error","params"),finish:i("finish","params")})}};class O{constructor(t){this.getState=t}get state(){return this.getState()}}const S=()=>{const c={},t=(a,i)=>{var s;(s=c[a])!=null&&s.includes(i)&&(c[a]=c[a].filter(e=>e!==i))},r=(a,i)=>{var s;(s=c[a])!=null&&s.includes(i)||(c[a]=[...c[a]??[],i])};return{init:a=>({watch:i=>(r(a,i),{dispose:()=>t(a,i)})}),emit:a=>(...i)=>{var s;(s=c[a])==null||s.forEach(e=>e(...i))}}};m.createAction=b,m.createStore=P,Object.defineProperty(m,Symbol.toStringTag,{value:"Module"})});
+(function(w,y){typeof exports=="object"&&typeof module<"u"?y(exports):typeof define=="function"&&define.amd?define(["exports"],y):(w=typeof globalThis<"u"?globalThis:w||self,y(w["chain-store"]={}))})(this,function(w){"use strict";const y=()=>E(),M=n=>{const s=[],e=[];let r={},u=[],t=!1,o=n;const d=c=>{var l;return(l=x(s,void 0,a=>a[0]===c))==null?void 0:l[1].dispose()},g={on:(c,l)=>(d(c),s.push([c,c.watch((...a)=>{var h;t=!0;const i=e.map(([b])=>b(o)),f=l(o,...a);f!==o&&(o=f,(h=r.emit)==null||h.call(r,o)),e.forEach(([b,p],m)=>{const A=b(o);A!==(i==null?void 0:i[m])&&p(A)}),t=!1,u.forEach(b=>b()),u=[]})]),g),off:c=>(d(c),g),map:c=>({getState:()=>c(o),watch:l=>(e.push([c,l]),{dispose:()=>{const a=()=>x(e,void 0,([i,f])=>i===c&&f===l);t?u.push(a):a()}})}),getState:()=>o,watch:S(r)};return g},E=(n,s,e,r)=>{let u={};const t=[],o=(c,l)=>{var a;(a=u.emit)==null||a.call(u,c),t.forEach(i=>i(c,l))},d=(c,l)=>{try{if(e)return P(c,e,a=>o(a,l));if(r)return P(c,r,a=>a&&o(c,l));o(c,l)}catch{}};return s==null||s(d),Object.assign(c=>{(n??d)(c)},{watch:S(u),map:c=>E(n??d,O(t),c),filter:c=>E(n??d,O(t),void 0,c),target:(c,l)=>z(n??d,O(t),c,l)})},z=(n,s,e,r)=>{let u={},t={},o={},d={};const g=[],c=async(i,f)=>{var m,A,q,F,I,K;const h=e(i);if(!(h instanceof Promise)){(m=u.emit)==null||m.call(u,i),(A=t.emit)==null||A.call(t,h,i),f==null||f.done(h,i);return}const b=g.includes(h),p=(r==null?void 0:r.skipDuplicates)!==!1;!b&&p&&g.push(h),(!b||!p)&&((q=u.emit)==null||q.call(u,i));try{const j=await h;(!b||!p)&&((F=t.emit)==null||F.call(t,j,i)),f==null||f.done(j,i)}catch(j){(!b||!p)&&((I=o.emit)==null||I.call(o,j,i)),f==null||f.fail(j,i)}finally{!b||!p?(K=d.emit)==null||K.call(d,i):window.requestAnimationFrame(()=>{x(g,h)}),f==null||f.finish(i)}};return s(async(i,f)=>{try{await c(i,f)}catch{}}),Object.assign(i=>{const{events:f,methods:h}=D();return n(i,f),h},{watch:S(u),done:{watch:S(t)},fail:{watch:S(o)},finish:{watch:S(d)}})},P=(n,s,e)=>{if(!s)return e(n);const r=s(n);if(!(r instanceof Promise))return e(r);r.then(e).catch(()=>{})},T=["done","fail","finish"],D=n=>{const s={},e=n??{state:"pending",stored:[],set:t=>e.state=t,controller:new B(()=>e.state)},r=T.reduce((t,o,d)=>({...t,[o]:(g,c)=>{var l;e.stored[d]=g,d<2&&e.set(o),(l=s[o])==null||l.call(s,g,c)}}),{}),u=(t,o)=>({[t]:s[t]?void 0:d=>(s[t]=d,e.state!=="pending"&&d(e.stored[o],o<2?e.stored[2]:void 0),D(e).methods)});return{events:r,methods:Object.assign(e.controller,T.reduce((t,o,d)=>({...t,...u(o,d)}),{}))}};class B{constructor(s){this.getState=s}get state(){return this.getState()}}const O=n=>s=>n.push(s),x=(n,s,e)=>{const r=n.findIndex(e??(u=>s===u));return r>=0?n.splice(r,1)[0]:void 0},S=n=>s=>{if(n!=null&&n.watch)return n.watch(s);const e=[],r=t=>x(e,t),u=t=>!e.includes(t)&&e.push(t);return n.watch=t=>(u(t),{dispose:()=>r(t)}),n.emit=(...t)=>e.forEach(o=>o(...t)),n.watch(s)};w.createAction=y,w.createStore=M,Object.defineProperty(w,Symbol.toStringTag,{value:"Module"})});

package/dist/types.d.ts

@@ -1,10 +1,10 @@
 type ActionCall<Params, Result extends unknown = void> = (params: Params) => Result;
-export type ActionPromise<Params, Result, Error, Methods = ActionPromiseMethods<Params, Result, Error>, Remaining extends keyof Methods = keyof Methods> = {
+export type ActionPromise<Params, Result, Error, Methods = ActionPromiseEvents<Params, Result, Error>, Remaining extends keyof Methods = keyof Methods> = {
     state: "pending" | "done" | "fail";
 } & {
     [K in Remaining]: (fn: Methods[K]) => ActionPromise<Params, Result, Error, Methods, Exclude<Remaining, K>>;
 };
-export type ActionPromiseMethods<Params, Result, Error> = {
+export type ActionPromiseEvents<Params = any, Result = any, Error = any> = {
     done: (result: Result, params: Params) => void;
     fail: (error: Error, params: Params) => void;
     finish: (params: Params) => void;
@@ -20,7 +20,7 @@ export interface Subscription {
 export interface Unit<Params> {
     watch: (watcher: (...args: Args<Params>) => void) => Subscription;
 }
-export interface Action<Input, Output = Input> extends ActionCall<Input>, Unit<Input> {
+export interface Action<Input, Output = Input> extends ActionCall<Input>, Unit<Output> {
     filter: (fn: ChainFn<Output, boolean>) => Action<Input, Output>;
     map: <Mapped>(fn: ChainFn<Output, Mapped>) => Action<Input, Mapped>;
     target: <Result, Err = Error>(fn: ChainFn<Output, Result>) => AsyncAction<Input, Result, Output, Err>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "chain-store",
   "description": "Simple event-based state manager",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "author": {
     "name": "Aleksandr Gurianov",
     "url": "http://golova.pro"