@ludekarts/minirdx 0.3.0 → 0.5.0-beta.2

package/dist/index.d.ts

@@ -1,11 +1,14 @@
 export type Action<S> = (state: () => S, ...args: any[]) => S | Promise<S>;
+type ActionEventName<A> = keyof A | "link";
+type Middleware<S> = (state: () => S, actionName: string) => S | Promise<S>;
 type OmitFirstParam<T extends (...args: any[]) => any> = T extends (state: any, ...args: infer P) => any ? P : never;
 export interface Store<S, A extends Record<string, Action<S>>> {
     state: () => S;
     actions: {
         [K in keyof A]: (...args: OmitFirstParam<A[K]>) => Promise<S>;
     };
-    on: (action: keyof A | ((state: S, actionName: keyof A) => void), listener?: (state: S, actionName: keyof A) => void) => () => void;
+    on: (action: keyof A | ((state: S, actionName: ActionEventName<A>) => void), listener?: (state: S, actionName: ActionEventName<A>) => void) => () => void;
+    tap: (action: keyof A | Middleware<S>, middleware?: Middleware<S>) => () => void;
 }
 export declare function createStore<S, A extends Record<string, Action<S>>>(config: {
     state: S;
@@ -14,7 +17,7 @@ export declare function createStore<S, A extends Record<string, Action<S>>>(conf
 export declare function selector<S, Args extends any[]>(path: string, action: (...args: Args) => any): (state: () => S, ...args: OmitFirstParam<typeof action>) => S | Promise<S>;
 type SelectorObject<V> = {
     getter: (state: unknown) => V;
-    setter: (_state: unknown, value: V) => V;
+    setter: (state: unknown, value: V) => V;
 };
 export declare function createSelector<V>(selector: string): SelectorObject<V>;
 export declare function link<T>(...args: any[]): Readonly<{

package/dist/minirdx.index.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=["on","state","actions"];function E(t){let{state:n,actions:a}=t;const r=[],s=new Map;w(n,(e,o)=>{if(x(e)){const{setter:f}=d(`state.${o}`),i=u=>{f(y(),u),h()};e._rdx_link_(i)}});const c=Object.fromEntries(Object.entries(a).map(([e,o])=>{if(S.includes(e))throw new Error(`MiniRdxError: "${e}" is a reserved keyword`);if(typeof o!="function")throw new Error(`MiniRdxError: "${e}" should be a function`);return[e,(...f)=>new Promise(i=>{p(e,u=>o(u,...f),i)})]}));function p(e,o,f){const i=o(y);m(i)?i.then(u=>l(u,e,f)):l(i,e,f)}function l(e,o,f){var i;n=e,r.length&&r.forEach(u=>u(n,o)),(i=s.get(o))==null||i.forEach(u=>u(n,o)),f(n)}function y(){return n}function h(){const e=A(n)?{...n}:Array.isArray(n)?[...n]:n;r.length&&r.forEach(o=>o(e,"link"))}function g(e,o){var f;if(typeof e=="function"&&o===void 0)return r.push(e),()=>r.splice(r.indexOf(e),1);if(typeof e=="string"&&o)return s.has(e)||s.set(e,[]),(f=s.get(e))==null||f.push(o),()=>{var i,u;(u=s.get(e))==null||u.splice((i=s.get(e))==null?void 0:i.indexOf(o),1)};throw new Error("MiniRdxError: Invalid arguments. Try: state.on(action: string, listener: ActionListener)")}return{state:y,actions:c,on:g}}function O(t,n){const{getter:a,setter:r}=d(t);return function(c,...p){if(_(n))return Promise.resolve(n(a(c()),...p)).then(l=>({...r(c(),l)}));{const l=n(a(c()),...p);return{...r(c(),l)}}}}function d(t){if(/^state\.[\w\[\]\d\.]+$/.test(t))return{getter:new Function("state",`return ${t}`),setter:new Function("state","value",`{${t} = value; return state;}`)};throw new Error('MiniRDXError: Selector should be a string with dot notation starting with "state." e.g.: "state.user.cars[1].model" ')}function $(...t){return Object.freeze({_rdx_link_:n=>{const a=t.pop(),r=t,s=()=>{n(a(...r.map(c=>c.state())))};r.forEach(c=>c.on(()=>s())),s()}})}function m(t){return!!t&&(typeof t=="object"||typeof t=="function")&&typeof t.then=="function"}function _(t){return t.constructor.name==="AsyncFunction"}function w(t,n,a=""){if(!(typeof t!="object"||t===null)){for(const r in t)if(t.hasOwnProperty(r)){const s=t[r],c=/\d+/.test(r)?`[${r}]`:`.${r}`,p=a?`${a}${c}`:r;n(s,p),typeof s=="object"&&s!==null&&w(s,n,p)}}}function x(t){return t!==null&&typeof t=="object"&&t.hasOwnProperty("_rdx_link_")}function A(t){return!!t&&typeof t!="symbol"&&typeof t!="string"&&typeof t!="number"&&typeof t!="boolean"&&typeof t!="function"&&!Array.isArray(t)}exports.createSelector=d;exports.createStore=E;exports.link=$;exports.selector=O;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const k=["on","tap","state","actions"];function P(t){let{state:e,actions:u}=t;const r=[],s=new Map,o=new Map;_(e,(n,i)=>{if(T(n)){const{setter:l}=A(`state.${i}`),f=c=>{l(y(),c),S()};n._rdx_link_(f)}});const a=Object.fromEntries(Object.entries(u).map(([n,i])=>{if(k.includes(n))throw new Error(`MiniRdxError: "${n}" is a reserved keyword`);if(typeof i!="function")throw new Error(`MiniRdxError: "${n}" should be a function`);return[n,(...l)=>new Promise((f,c)=>{p(n,i,l,f,c)})]}));function p(n,i,l,f,c){try{const d=L(n),w=h=>i(h,...l);g(d,n).then(()=>Promise.resolve(w(y))).then(h=>E(h,n,f)).catch(c)}catch(d){c(d)}}function g(n,i){return n.reduce((l,f)=>l.then(()=>Promise.resolve(f(y,i))).then(c=>{e=c}),Promise.resolve())}function E(n,i,l){var f;e=n,r.length&&r.forEach(c=>c(e,i)),(f=s.get(i))==null||f.forEach(c=>c(e,i)),l(e)}function y(){return e}function S(){const n=m(e)?{...e}:Array.isArray(e)?[...e]:e;e=n,r.length&&r.forEach(i=>i(n,"link"))}function x(n,i){var l;if(typeof n=="function"&&i===void 0)return r.push(n),()=>{const f=r.indexOf(n);f>=0&&r.splice(f,1)};if(typeof n=="string"&&i)return s.has(n)||s.set(n,[]),(l=s.get(n))==null||l.push(i),()=>{const f=s.get(n);if(!f)return;const c=f.indexOf(i);c>=0&&f.splice(c,1)};throw new Error("MiniRdxError: Invalid arguments. Try: state.on(action: string, listener: ActionListener)")}function I(n,i){var w;const c=typeof n=="function"&&i===void 0?"*":typeof n=="string"&&typeof i=="function"?n:null,d=typeof i=="function"?i:n;if(c===null||typeof d!="function")throw new Error("MiniRdxError: Invalid arguments. Try: state.tap(actionName, middleware)");return!o.has(c)&&o.set(c,[]),(w=o.get(c))==null||w.push(d),()=>{const h=o.get(c);if(!h)return;const O=h.indexOf(d);O>=0&&h.splice(O,1)}}function L(n){const i=o.get("*")||[],l=o.get(n)||[];return[...i,...l]}return{state:y,on:x,actions:a,tap:I}}function $(t,e){const{getter:u,setter:r}=A(t),s=o=>Array.isArray(o)?[...o]:m(o)?{...o}:o;return function(a,...p){const g=e(u(a()),...p);if(b(g))return Promise.resolve(g).then(y=>{const S=r(a(),y);return s(S)});const E=r(a(),g);return s(E)}}function A(t){const e=R(t);return{getter:u=>{let r=u;for(const s of e)r=r[s];return r},setter:(u,r)=>{let s=u;for(let o=0;o<e.length-1;o++)s=s[e[o]];return s[e[e.length-1]]=r,u}}}function R(t){if(!/^state(?:\.[A-Za-z_$][\w$]*|\[\d+\])+$/.test(t))throw new Error('MiniRDXError: Selector should be a string with dot notation starting with "state." e.g.: "state.user.cars[1].model" ');const e=t.slice(6),u=[];let r=0;for(;r<e.length;){const s=e[r];if(s==="."){r++;continue}if(s==="["){const a=e.indexOf("]",r+1),p=e.slice(r+1,a);u.push(Number(p)),r=a+1;continue}let o=r;for(;o<e.length&&/[\w$]/.test(e[o]);)o++;u.push(e.slice(r,o)),r=o}return u}function D(...t){return Object.freeze({_rdx_link_:e=>{const u=t.pop(),r=t,s=()=>{e(u(...r.map(o=>o.state())))};r.forEach(o=>o.on(()=>s())),s()}})}function b(t){return!!t&&(typeof t=="object"||typeof t=="function")&&typeof t.then=="function"}function _(t,e,u="",r=new WeakSet){if(!(typeof t!="object"||t===null)&&!r.has(t)){r.add(t);for(const s in t)if(M(t,s)){const o=t[s],a=/\d+/.test(s)?`[${s}]`:`.${s}`,p=u?`${u}${a}`:s;e(o,p),typeof o=="object"&&o!==null&&_(o,e,p,r)}}}function T(t){return t!==null&&typeof t=="object"&&M(t,"_rdx_link_")}function M(t,e){return Object.prototype.hasOwnProperty.call(t,e)}function m(t){return!!t&&typeof t!="symbol"&&typeof t!="string"&&typeof t!="number"&&typeof t!="boolean"&&typeof t!="function"&&!Array.isArray(t)}exports.createSelector=A;exports.createStore=P;exports.link=D;exports.selector=$;

package/dist/minirdx.index.es.js

@@ -1,130 +1,191 @@
-const E = ["on", "state", "actions"];
-function _(t) {
-  let { state: n, actions: a } = t;
-  const r = [], s = /* @__PURE__ */ new Map();
-  w(n, (e, o) => {
-    if ($(e)) {
-      const { setter: f } = d(`state.${o}`), i = (u) => {
-        f(y(), u), h();
+const k = ["on", "tap", "state", "actions"];
+function D(t) {
+  let { state: e, actions: u } = t;
+  const r = [], s = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map();
+  S(e, (n, i) => {
+    if (R(n)) {
+      const { setter: l } = O(`state.${i}`), f = (c) => {
+        l(y(), c), A();
       };
-      e._rdx_link_(i);
+      n._rdx_link_(f);
     }
   });
-  const c = Object.fromEntries(
-    Object.entries(a).map(([e, o]) => {
-      if (E.includes(e))
-        throw new Error(`MiniRdxError: "${e}" is a reserved keyword`);
-      if (typeof o != "function")
-        throw new Error(`MiniRdxError: "${e}" should be a function`);
+  const a = Object.fromEntries(
+    Object.entries(u).map(([n, i]) => {
+      if (k.includes(n))
+        throw new Error(`MiniRdxError: "${n}" is a reserved keyword`);
+      if (typeof i != "function")
+        throw new Error(`MiniRdxError: "${n}" should be a function`);
       return [
-        e,
-        (...f) => new Promise((i) => {
-          p(
-            e,
-            (u) => o(u, ...f),
-            i
-          );
+        n,
+        (...l) => new Promise((f, c) => {
+          p(n, i, l, f, c);
         })
       ];
     })
   );
-  function p(e, o, f) {
-    const i = o(y);
-    S(i) ? i.then(
-      (u) => l(u, e, f)
-    ) : l(i, e, f);
+  function p(n, i, l, f, c) {
+    try {
+      const d = m(n), g = (h) => i(h, ...l);
+      w(d, n).then(() => Promise.resolve(g(y))).then(
+        (h) => E(h, n, f)
+      ).catch(c);
+    } catch (d) {
+      c(d);
+    }
+  }
+  function w(n, i) {
+    return n.reduce(
+      (l, f) => l.then(() => Promise.resolve(f(y, i))).then((c) => {
+        e = c;
+      }),
+      Promise.resolve()
+    );
   }
-  function l(e, o, f) {
-    var i;
-    n = e, r.length && r.forEach((u) => u(n, o)), (i = s.get(o)) == null || i.forEach((u) => u(n, o)), f(n);
+  function E(n, i, l) {
+    var f;
+    e = n, r.length && r.forEach((c) => c(e, i)), (f = s.get(i)) == null || f.forEach((c) => c(e, i)), l(e);
   }
   function y() {
-    return n;
+    return e;
   }
-  function h() {
-    const e = x(n) ? { ...n } : Array.isArray(n) ? [...n] : n;
-    r.length && r.forEach((o) => o(e, "link"));
+  function A() {
+    const n = M(e) ? { ...e } : Array.isArray(e) ? [...e] : e;
+    e = n, r.length && r.forEach((i) => i(n, "link"));
   }
-  function g(e, o) {
-    var f;
-    if (typeof e == "function" && o === void 0)
-      return r.push(e), () => r.splice(r.indexOf(e), 1);
-    if (typeof e == "string" && o)
-      return s.has(e) || s.set(e, []), (f = s.get(e)) == null || f.push(o), () => {
-        var i, u;
-        (u = s.get(e)) == null || u.splice((i = s.get(e)) == null ? void 0 : i.indexOf(o), 1);
+  function I(n, i) {
+    var l;
+    if (typeof n == "function" && i === void 0)
+      return r.push(n), () => {
+        const f = r.indexOf(n);
+        f >= 0 && r.splice(f, 1);
+      };
+    if (typeof n == "string" && i)
+      return s.has(n) || s.set(n, []), (l = s.get(n)) == null || l.push(i), () => {
+        const f = s.get(n);
+        if (!f) return;
+        const c = f.indexOf(i);
+        c >= 0 && f.splice(c, 1);
       };
     throw new Error(
       "MiniRdxError: Invalid arguments. Try: state.on(action: string, listener: ActionListener)"
     );
   }
+  function L(n, i) {
+    var g;
+    const c = typeof n == "function" && i === void 0 ? "*" : typeof n == "string" && typeof i == "function" ? n : null, d = typeof i == "function" ? i : n;
+    if (c === null || typeof d != "function")
+      throw new Error(
+        "MiniRdxError: Invalid arguments. Try: state.tap(actionName, middleware)"
+      );
+    return !o.has(c) && o.set(c, []), (g = o.get(c)) == null || g.push(d), () => {
+      const h = o.get(c);
+      if (!h) return;
+      const _ = h.indexOf(d);
+      _ >= 0 && h.splice(_, 1);
+    };
+  }
+  function m(n) {
+    const i = o.get("*") || [], l = o.get(n) || [];
+    return [...i, ...l];
+  }
   return {
     state: y,
-    actions: c,
-    on: g
+    on: I,
+    actions: a,
+    tap: L
+  };
+}
+function T(t, e) {
+  const { getter: u, setter: r } = O(t), s = (o) => Array.isArray(o) ? [...o] : M(o) ? { ...o } : o;
+  return function(a, ...p) {
+    const w = e(u(a()), ...p);
+    if ($(w))
+      return Promise.resolve(w).then((y) => {
+        const A = r(a(), y);
+        return s(A);
+      });
+    const E = r(a(), w);
+    return s(E);
   };
 }
-function m(t, n) {
-  const { getter: a, setter: r } = d(t);
-  return function(c, ...p) {
-    if (O(n))
-      return Promise.resolve(
-        n(a(c()), ...p)
-      ).then((l) => ({ ...r(c(), l) }));
-    {
-      const l = n(a(c()), ...p);
-      return { ...r(c(), l) };
+function O(t) {
+  const e = P(t);
+  return {
+    getter: (u) => {
+      let r = u;
+      for (const s of e)
+        r = r[s];
+      return r;
+    },
+    setter: (u, r) => {
+      let s = u;
+      for (let o = 0; o < e.length - 1; o++)
+        s = s[e[o]];
+      return s[e[e.length - 1]] = r, u;
     }
   };
 }
-function d(t) {
-  if (/^state\.[\w\[\]\d\.]+$/.test(t))
-    return {
-      getter: new Function("state", `return ${t}`),
-      setter: new Function(
-        "state",
-        "value",
-        `{${t} = value; return state;}`
-      )
-    };
-  throw new Error(
-    'MiniRDXError: Selector should be a string with dot notation starting with "state." e.g.: "state.user.cars[1].model" '
-  );
+function P(t) {
+  if (!/^state(?:\.[A-Za-z_$][\w$]*|\[\d+\])+$/.test(t))
+    throw new Error(
+      'MiniRDXError: Selector should be a string with dot notation starting with "state." e.g.: "state.user.cars[1].model" '
+    );
+  const e = t.slice(6), u = [];
+  let r = 0;
+  for (; r < e.length; ) {
+    const s = e[r];
+    if (s === ".") {
+      r++;
+      continue;
+    }
+    if (s === "[") {
+      const a = e.indexOf("]", r + 1), p = e.slice(r + 1, a);
+      u.push(Number(p)), r = a + 1;
+      continue;
+    }
+    let o = r;
+    for (; o < e.length && /[\w$]/.test(e[o]); )
+      o++;
+    u.push(e.slice(r, o)), r = o;
+  }
+  return u;
 }
-function A(...t) {
+function b(...t) {
   return Object.freeze({
-    _rdx_link_: (n) => {
-      const a = t.pop(), r = t, s = () => {
-        n(a(...r.map((c) => c.state())));
+    _rdx_link_: (e) => {
+      const u = t.pop(), r = t, s = () => {
+        e(u(...r.map((o) => o.state())));
       };
-      r.forEach((c) => c.on(() => s())), s();
+      r.forEach((o) => o.on(() => s())), s();
     }
   });
 }
-function S(t) {
+function $(t) {
   return !!t && (typeof t == "object" || typeof t == "function") && typeof t.then == "function";
 }
-function O(t) {
-  return t.constructor.name === "AsyncFunction";
-}
-function w(t, n, a = "") {
-  if (!(typeof t != "object" || t === null)) {
-    for (const r in t)
-      if (t.hasOwnProperty(r)) {
-        const s = t[r], c = /\d+/.test(r) ? `[${r}]` : `.${r}`, p = a ? `${a}${c}` : r;
-        n(s, p), typeof s == "object" && s !== null && w(s, n, p);
+function S(t, e, u = "", r = /* @__PURE__ */ new WeakSet()) {
+  if (!(typeof t != "object" || t === null) && !r.has(t)) {
+    r.add(t);
+    for (const s in t)
+      if (x(t, s)) {
+        const o = t[s], a = /\d+/.test(s) ? `[${s}]` : `.${s}`, p = u ? `${u}${a}` : s;
+        e(o, p), typeof o == "object" && o !== null && S(o, e, p, r);
       }
   }
 }
-function $(t) {
-  return t !== null && typeof t == "object" && t.hasOwnProperty("_rdx_link_");
+function R(t) {
+  return t !== null && typeof t == "object" && x(t, "_rdx_link_");
+}
+function x(t, e) {
+  return Object.prototype.hasOwnProperty.call(t, e);
 }
-function x(t) {
+function M(t) {
   return !!t && typeof t != "symbol" && typeof t != "string" && typeof t != "number" && typeof t != "boolean" && typeof t != "function" && !Array.isArray(t);
 }
 export {
-  d as createSelector,
-  _ as createStore,
-  A as link,
-  m as selector
+  O as createSelector,
+  D as createStore,
+  b as link,
+  T as selector
 };

package/dist/minirdx.react.cjs.js

@@ -1 +1 @@
-"use strict";const r=require("react");function y(i){const{state:e,on:o,actions:u}=i;function f(t){const[n,p]=r.useState(typeof t=="function"?t(e()):e()),d=s=>{const c=typeof t=="function"?t(s):s;c!==n&&p(c)};return r.useEffect(()=>o(d),[n]),[n,u]}function a(){return u}function S(){return o}return{useStore:f,useStoreActions:a,useStoreListeners:S}}module.exports=y;
+"use strict";const i=require("react");function j(r){const{state:c,on:o,actions:a}=r;function f(t,s){const d=typeof t=="function"?t(c()):c(),[D,E]=i.useState(d);return i.useEffect(()=>{const b=typeof s=="function"?s:(n,e)=>Object.is(n,e);return o(n=>{const e=typeof t=="function"?t(n):n;E(u=>b(u,e)?u:e)})},[o,t,s]),D}function S(){return a}function p(){return o}return{useStore:f,useStoreActions:S,useStoreListeners:p}}module.exports=j;

package/dist/minirdx.react.es.js

@@ -1,23 +1,24 @@
-import { useState as d, useEffect as m } from "react";
-function k(c) {
-  const { state: e, on: o, actions: u } = c;
-  function f(t) {
-    const [n, S] = d(
-      typeof t == "function" ? t(e()) : e()
-    ), p = (r) => {
-      const s = typeof t == "function" ? t(r) : r;
-      s !== n && S(s);
-    };
-    return m(() => o(p), [n]), [n, u];
-  }
-  function i() {
-    return u;
+import { useState as E, useEffect as b } from "react";
+function y(i) {
+  const { state: s, on: e, actions: f } = i;
+  function r(t, u) {
+    const S = typeof t == "function" ? t(s()) : s(), [d, m] = E(S);
+    return b(() => {
+      const D = typeof u == "function" ? u : (n, o) => Object.is(n, o);
+      return e((n) => {
+        const o = typeof t == "function" ? t(n) : n;
+        m((c) => D(c, o) ? c : o);
+      });
+    }, [e, t, u]), d;
   }
   function a() {
-    return o;
+    return f;
+  }
+  function p() {
+    return e;
   }
-  return { useStore: f, useStoreActions: i, useStoreListeners: a };
+  return { useStore: r, useStoreActions: a, useStoreListeners: p };
 }
 export {
-  k as default
+  y as default
 };

package/dist/react.d.ts

@@ -1,6 +1,6 @@
 import { Store, Action } from './index';
 export default function createStoreHooks<S, A extends Record<string, Action<S>>>(store: Store<S, A>): {
-    useStore: <T = S>(selector?: (state: S) => T) => [T, Store<S, A>["actions"]];
+    useStore: <T = S>(selector?: (state: S) => T, equalityFn?: (prev: T, next: T) => boolean) => T;
     useStoreActions: () => Store<S, A>["actions"];
-    useStoreListeners: () => (action: keyof A | ((state: S, actionName: keyof A) => void), listener?: ((state: S, actionName: keyof A) => void) | undefined) => () => void;
+    useStoreListeners: () => (action: keyof A | ((state: S, actionName: "link" | keyof A) => void), listener?: ((state: S, actionName: "link" | keyof A) => void) | undefined) => () => void;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ludekarts/minirdx",
-  "version": "0.3.0",
+  "version": "0.5.0-beta.2",
   "description": "Minimal state management library",
   "scripts": {
     "dev": "vite build --watch",