atomaric 0.0.10 → 0.0.12

package/build/atomaric.js

@@ -1,76 +1,122 @@
-class v {
+class C {
+  constructor(s) {
+    this.value = s;
+  }
+  getValue() {
+    return this.value;
+  }
+  setValue(s) {
+    this.value = s;
+  }
+}
+class T extends C {
   constructor(s, n) {
-    if (this._defaultValue = s, this.subscribers = /* @__PURE__ */ new Set(), this.save = () => {
-    }, this.invokeSubscriber = (e) => e(this.value), this.do = {}, this.get = () => this.value, this.toggle = () => this.set(!this.value), this.inkrement = (e) => this.set(this.value + e), this.subscribe = (e) => (this.subscribers.add(e), () => {
+    super(s), this._defaultValue = s, this.subscribers = /* @__PURE__ */ new Set(), this.save = () => {
+    }, this.invokeSubscriber = (e) => e(this.get()), this.do = {}, this.get = () => super.getValue(), this.subscribe = (e) => (this.subscribers.add(e), () => {
       this.subscribers.delete(e);
-    }), this.set = (e, h) => {
-      const o = typeof e == "function" ? e(this.value) : e;
-      o === this.value || o === void 0 || typeof o == "number" && isNaN(o) || (this.value = o, this.subscribers.forEach(this.invokeSubscriber, this), h !== !0 && this.save(o));
-    }, this.setDeferred = (e, h = 500, o, g = !0) => {
-      g && this.debounceTimeout === void 0 && this.set(e, o), clearTimeout(this.debounceTimeout), this.debounceTimeout = setTimeout(() => {
-        this.set(e, o), delete this.debounceTimeout;
-      }, h);
-    }, typeof n == "object") {
-      const e = "do" in n ? n.do(this.get, this.set) : {};
-      this.do = s instanceof Set ? {
-        ...e,
-        add: (h) => {
-          const o = new Set(this.value), g = o.add(h);
-          return this.set(o), g;
-        },
-        delete: (h) => {
-          const o = new Set(this.value), g = o.delete(h);
-          return this.set(o), g;
-        },
-        clear: () => {
-          this.set(/* @__PURE__ */ new Set());
-        }
-      } : e;
-    }
-    if (this.value = s, typeof s != "boolean" && (this.toggle = () => {
-    }), typeof s != "number" && (this.inkrement = () => {
-    }), this.reset = () => {
+    }), this.set = (e, i) => {
+      const l = typeof e == "function" ? e(this.get()) : e;
+      l === this.get() || l === void 0 || typeof l == "number" && isNaN(l) || (super.setValue(l), this.subscribers.forEach(this.invokeSubscriber, this), i !== !0 && this.save(l));
+    }, this.setDeferred = (e, i = 500, l, k = !0) => {
+      k && this.debounceTimeout === void 0 && this.set(e, l), clearTimeout(this.debounceTimeout), this.debounceTimeout = setTimeout(() => {
+        this.set(e, l), delete this.debounceTimeout;
+      }, i);
+    };
+    const c = (e, i) => i;
+    let h = null;
+    typeof s == "number" && (h = c(s, {
+      increment: (e) => {
+        this.set(+this.get() + (e ?? 0));
+      }
+    })), typeof s == "boolean" && (h = c(s, {
+      toggle: () => {
+        this.set(!this.get());
+      }
+    })), Array.isArray(s) && (h = c(s, {
+      push: (e) => {
+        this.set([...this.get(), e]);
+      },
+      unshift: (e) => {
+        this.set([e, ...this.get()]);
+      },
+      update: (e) => {
+        const i = [...this.get()];
+        e(i), this.set(i);
+      },
+      filter: (e) => {
+        this.set(this.get().filter(e ?? U));
+      }
+    })), s instanceof Set && (h = c(s, {
+      add: (e) => {
+        const i = new Set(this.get());
+        i.add(e), this.set(i);
+      },
+      delete: (e) => {
+        const i = new Set(this.get());
+        i.delete(e), this.set(i);
+      },
+      clear: () => {
+        this.set(/* @__PURE__ */ new Set());
+      },
+      update: (e) => {
+        const i = new Set(this.get());
+        e(i), this.set(i);
+      }
+    }));
+    const E = typeof n == "object" && "do" in n ? n.do(
+      () => this.get(),
+      (e, i) => this.set(e, i)
+    ) : {};
+    if (this.do = {
+      ...E,
+      ...h
+    }, this.reset = () => {
       this.set(s, !0), this.subscribers.forEach(this.invokeSubscriber, this);
     }, n == null) return;
-    let r = null, c = !0, b = !0, u = !1, f = s instanceof Set ? (e) => new Set(JSON.parse(e)) : (e) => JSON.parse(e), d = s instanceof Set ? (e) => {
+    let d = null, m = !0, S = !0, b = !1, g = s instanceof Set ? (e) => new Set(JSON.parse(e)) : (e) => JSON.parse(e), f = s instanceof Set ? (e) => {
       if (e instanceof Set) return JSON.stringify(Array.from(e));
       throw console.error(e), "The value is not Set instance";
     } : (e) => JSON.stringify(e);
-    if (typeof n == "string" ? r = n : "storeKey" in n && (c = n.warnOnDuplicateStoreKey ?? !0, b = n.listenStorageChanges ?? !0, r = n.storeKey, f = n.parseValue ?? f, d = n.stringifyValue ?? d, u = n.unchangable ?? u), r === null) return;
-    const l = `atom/${r}`;
-    let m = !0;
+    if (typeof n == "string" ? d = n : "storeKey" in n && (m = n.warnOnDuplicateStoreKey ?? !0, S = n.listenStorageChanges ?? !0, d = n.storeKey, g = n.parseValue ?? g, f = n.stringifyValue ?? f, b = n.unchangable ?? b), d === null) return;
+    const o = `atom/${d}`;
+    let v = !0;
     if (this.get = () => {
-      if (this.get = () => this.value, m) {
-        m = !1;
+      if (this.get = () => super.getValue(), v) {
+        v = !1;
         try {
-          this.value = l in i ? f(i[l]) : s;
+          super.setValue(o in r ? g(r[o]) : s);
         } catch {
-          console.warn("Invalid json value", i[l]);
+          console.warn("Invalid json value", r[o]);
         }
       }
-      return this.value;
+      return super.getValue();
     }, this.save = (e) => {
       if (e === s) {
         this.reset();
         return;
       }
-      i[l] = d(e);
+      r[o] = f(e), I(o);
     }, this.reset = () => {
-      delete i[l], this.set(s, !0);
-    }, c && a[l] !== void 0 && console.warn("Duplicate Atom key", r), a[l] = {}, b)
-      if (u) {
-        let e = !1;
-        a[l].unchangable = () => {
-          e || (e = !0, i[l] = d(this.value), setTimeout(() => e = !1, 100));
-        }, k();
+      delete r[o], this.set(s, !0);
+    }, m && u[o] !== void 0 && console.warn("Duplicate Atom key", d), u[o] = {}, S)
+      if (b) {
+        let e, i = !1;
+        u[o].updateUnchangable = () => {
+          try {
+            this.set(g(r[o]), !0);
+          } catch {
+          }
+        }, a[o] = () => {
+          i || (i = !0, r[o] = f(this.get()), clearTimeout(e), e = setTimeout(() => i = !1, 100));
+        }, N();
       } else
-        a[l].updatable = (e) => {
+        u[o].updatable = (e) => {
           if (e.newValue === null) {
             this.reset();
             return;
           }
           try {
-            this.set(f(e.newValue));
+            this.set(g(e.newValue));
           } catch {
             console.warn("Invalid json value", e.newValue);
           }
@@ -80,61 +126,67 @@ class v {
     return this._defaultValue;
   }
 }
-const i = window.localStorage, a = {};
+const r = window.localStorage, u = {}, a = {};
 window.addEventListener("storage", (t) => {
-  var s, n, r, c;
-  t.key !== null && ((n = (s = a[t.key]) == null ? void 0 : s.unchangable) == null || n.call(s), (c = (r = a[t.key]) == null ? void 0 : r.updatable) == null || c.call(r, t));
+  var s, n, c;
+  t.key === null || t.newValue === t.oldValue || ((s = a[t.key]) == null || s.call(a), (c = (n = u[t.key]) == null ? void 0 : n.updatable) == null || c.call(n, t));
 });
-const w = i.setItem.bind(i), I = i.removeItem.bind(i);
-i.setItem = (t, s) => {
-  var n;
-  ((n = a[t]) == null ? void 0 : n.unchangable) === void 0 && w.call(i, t, s);
+const A = new BroadcastChannel("unchangableChanged");
+A.addEventListener("message", (t) => {
+  var s, n;
+  (n = (s = u[t.data]) == null ? void 0 : s.updateUnchangable) == null || n.call(s);
+});
+const I = (t) => {
+  A.postMessage(t);
+}, D = r.setItem.bind(r), L = r.removeItem.bind(r), j = r.clear.bind(r);
+r.setItem = (t, s) => {
+  a[t] === void 0 && D.call(r, t, s);
+};
+r.removeItem = (t) => {
+  a[t] === void 0 && L.call(r, t);
 };
-i.removeItem = (t) => {
-  var s;
-  ((s = a[t]) == null ? void 0 : s.unchangable) === void 0 && I.call(i, t);
+r.clear = () => {
+  j(), w();
 };
-const k = /* @__PURE__ */ (() => {
+let p = r.length;
+const w = () => {
+  p !== r.length && (p = r.length, Object.keys(a).forEach((t) => {
+    t in r || (I(t), a[t]());
+  }));
+}, N = /* @__PURE__ */ (() => {
   let t = !1;
   return () => {
     if (t) return;
     t = !0;
     let s;
     const n = () => {
-      let r = i.length;
-      const c = () => {
-        r !== i.length && (r = i.length, Object.keys(a).forEach((b) => {
-          var u, f;
-          b in i || (f = (u = a[b]) == null ? void 0 : u.unchangable) == null || f.call(u);
-        }));
-      };
-      c(), s = setInterval(c, 100);
+      clearInterval(s), s = setInterval(w, 0), w();
     };
-    window.addEventListener("focus", () => clearInterval(s)), window.addEventListener("blur", n);
+    n(), window.addEventListener("focus", () => clearInterval(s), !0), window.addEventListener("focus", () => clearInterval(s), !1), window.addEventListener("click", () => clearInterval(s), !1), window.addEventListener("click", () => clearInterval(s), !0), window.addEventListener("blur", n, !0);
   };
 })();
 (() => {
   const t = (n) => {
-    var r, c;
-    n in i || (c = (r = a[n]) == null ? void 0 : r.unchangable) == null || c.call(r);
-  }, s = () => Object.keys(a).forEach(t);
+    var c;
+    n in r || (c = a[n]) == null || c.call(a);
+  }, s = () => Object.keys(u).forEach(t);
   Object.defineProperty(window, "localStorage", {
-    get: () => (Promise.resolve().then(s), i)
+    get: () => (Promise.resolve().then(s), r)
   });
 })();
-let S = () => {
+const U = (t) => t;
+let y = () => {
   throw "call configureAtomaric() before all!";
 };
-const E = (t) => S = t.useSyncExternalStore, y = (t) => S(t.subscribe, t.get), A = (t) => t.set, T = (t) => t.setDeferred, p = (t) => t.get, D = (t) => t.toggle, j = (t) => t.inkrement, N = (t) => [y(t), A(t)], C = (t, s) => new v(t, s);
+const J = (t) => y = t.useSyncExternalStore, V = (t) => y(t.subscribe, t.get), x = (t) => t.set, B = (t) => t.setDeferred, G = (t) => t.get, M = (t) => t.do, P = (t) => [V(t), x(t)], R = (t, s) => new T(t, s);
 export {
-  v as Atom,
-  C as atom,
-  E as configureAtomaric,
-  N as useAtom,
-  p as useAtomGet,
-  j as useAtomInkrement,
-  A as useAtomSet,
-  T as useAtomSetDeferred,
-  D as useAtomToggle,
-  y as useAtomValue
+  T as Atom,
+  R as atom,
+  J as configureAtomaric,
+  P as useAtom,
+  M as useAtomDo,
+  G as useAtomGet,
+  x as useAtomSet,
+  B as useAtomSetDeferred,
+  V as useAtomValue
 };

package/build/atomaric.umd.cjs

@@ -1 +1 @@
-(function(o,m){typeof exports=="object"&&typeof module<"u"?m(exports):typeof define=="function"&&define.amd?define(["exports"],m):(o=typeof globalThis<"u"?globalThis:o||self,m(o.atomaric={}))})(this,function(o){"use strict";class m{constructor(s,n){if(this._defaultValue=s,this.subscribers=new Set,this.save=()=>{},this.invokeSubscriber=e=>e(this.value),this.do={},this.get=()=>this.value,this.toggle=()=>this.set(!this.value),this.inkrement=e=>this.set(this.value+e),this.subscribe=e=>(this.subscribers.add(e),()=>{this.subscribers.delete(e)}),this.set=(e,f)=>{const u=typeof e=="function"?e(this.value):e;u===this.value||u===void 0||typeof u=="number"&&isNaN(u)||(this.value=u,this.subscribers.forEach(this.invokeSubscriber,this),f!==!0&&this.save(u))},this.setDeferred=(e,f=500,u,b=!0)=>{b&&this.debounceTimeout===void 0&&this.set(e,u),clearTimeout(this.debounceTimeout),this.debounceTimeout=setTimeout(()=>{this.set(e,u),delete this.debounceTimeout},f)},typeof n=="object"){const e="do"in n?n.do(this.get,this.set):{};this.do=s instanceof Set?{...e,add:f=>{const u=new Set(this.value),b=u.add(f);return this.set(u),b},delete:f=>{const u=new Set(this.value),b=u.delete(f);return this.set(u),b},clear:()=>{this.set(new Set)}}:e}if(this.value=s,typeof s!="boolean"&&(this.toggle=()=>{}),typeof s!="number"&&(this.inkrement=()=>{}),this.reset=()=>{this.set(s,!0),this.subscribers.forEach(this.invokeSubscriber,this)},n==null)return;let r=null,c=!0,g=!0,h=!1,d=s instanceof Set?e=>new Set(JSON.parse(e)):e=>JSON.parse(e),S=s instanceof Set?e=>{if(e instanceof Set)return JSON.stringify(Array.from(e));throw console.error(e),"The value is not Set instance"}:e=>JSON.stringify(e);if(typeof n=="string"?r=n:"storeKey"in n&&(c=n.warnOnDuplicateStoreKey??!0,g=n.listenStorageChanges??!0,r=n.storeKey,d=n.parseValue??d,S=n.stringifyValue??S,h=n.unchangable??h),r===null)return;const l=`atom/${r}`;let y=!0;if(this.get=()=>{if(this.get=()=>this.value,y){y=!1;try{this.value=l in i?d(i[l]):s}catch{console.warn("Invalid json value",i[l])}}return this.value},this.save=e=>{if(e===s){this.reset();return}i[l]=S(e)},this.reset=()=>{delete i[l],this.set(s,!0)},c&&a[l]!==void 0&&console.warn("Duplicate Atom key",r),a[l]={},g)if(h){let e=!1;a[l].unchangable=()=>{e||(e=!0,i[l]=S(this.value),setTimeout(()=>e=!1,100))},T()}else a[l].updatable=e=>{if(e.newValue===null){this.reset();return}try{this.set(d(e.newValue))}catch{console.warn("Invalid json value",e.newValue)}}}get defaultValue(){return this._defaultValue}}const i=window.localStorage,a={};window.addEventListener("storage",t=>{var s,n,r,c;t.key!==null&&((n=(s=a[t.key])==null?void 0:s.unchangable)==null||n.call(s),(c=(r=a[t.key])==null?void 0:r.updatable)==null||c.call(r,t))});const I=i.setItem.bind(i),k=i.removeItem.bind(i);i.setItem=(t,s)=>{var n;((n=a[t])==null?void 0:n.unchangable)===void 0&&I.call(i,t,s)},i.removeItem=t=>{var s;((s=a[t])==null?void 0:s.unchangable)===void 0&&k.call(i,t)};const T=(()=>{let t=!1;return()=>{if(t)return;t=!0;let s;const n=()=>{let r=i.length;const c=()=>{r!==i.length&&(r=i.length,Object.keys(a).forEach(g=>{var h,d;g in i||(d=(h=a[g])==null?void 0:h.unchangable)==null||d.call(h)}))};c(),s=setInterval(c,100)};window.addEventListener("focus",()=>clearInterval(s)),window.addEventListener("blur",n)}})();(()=>{const t=n=>{var r,c;n in i||(c=(r=a[n])==null?void 0:r.unchangable)==null||c.call(r)},s=()=>Object.keys(a).forEach(t);Object.defineProperty(window,"localStorage",{get:()=>(Promise.resolve().then(s),i)})})();let v=()=>{throw"call configureAtomaric() before all!"};const E=t=>v=t.useSyncExternalStore,w=t=>v(t.subscribe,t.get),A=t=>t.set,j=t=>t.setDeferred,D=t=>t.get,N=t=>t.toggle,p=t=>t.inkrement,C=t=>[w(t),A(t)],J=(t,s)=>new m(t,s);o.Atom=m,o.atom=J,o.configureAtomaric=E,o.useAtom=C,o.useAtomGet=D,o.useAtomInkrement=p,o.useAtomSet=A,o.useAtomSetDeferred=j,o.useAtomToggle=N,o.useAtomValue=w,Object.defineProperty(o,Symbol.toStringTag,{value:"Module"})});
+(function(o,d){typeof exports=="object"&&typeof module<"u"?d(exports):typeof define=="function"&&define.amd?define(["exports"],d):(o=typeof globalThis<"u"?globalThis:o||self,d(o.atomaric={}))})(this,function(o){"use strict";class d{constructor(s){this.value=s}getValue(){return this.value}setValue(s){this.value=s}}class v extends d{constructor(s,n){super(s),this._defaultValue=s,this.subscribers=new Set,this.save=()=>{},this.invokeSubscriber=e=>e(this.get()),this.do={},this.get=()=>super.getValue(),this.subscribe=e=>(this.subscribers.add(e),()=>{this.subscribers.delete(e)}),this.set=(e,r)=>{const l=typeof e=="function"?e(this.get()):e;l===this.get()||l===void 0||typeof l=="number"&&isNaN(l)||(super.setValue(l),this.subscribers.forEach(this.invokeSubscriber,this),r!==!0&&this.save(l))},this.setDeferred=(e,r=500,l,$=!0)=>{$&&this.debounceTimeout===void 0&&this.set(e,l),clearTimeout(this.debounceTimeout),this.debounceTimeout=setTimeout(()=>{this.set(e,l),delete this.debounceTimeout},r)};const u=(e,r)=>r;let f=null;typeof s=="number"&&(f=u(s,{increment:e=>{this.set(+this.get()+(e??0))}})),typeof s=="boolean"&&(f=u(s,{toggle:()=>{this.set(!this.get())}})),Array.isArray(s)&&(f=u(s,{push:e=>{this.set([...this.get(),e])},unshift:e=>{this.set([e,...this.get()])},update:e=>{const r=[...this.get()];e(r),this.set(r)},filter:e=>{this.set(this.get().filter(e??U))}})),s instanceof Set&&(f=u(s,{add:e=>{const r=new Set(this.get());r.add(e),this.set(r)},delete:e=>{const r=new Set(this.get());r.delete(e),this.set(r)},clear:()=>{this.set(new Set)},update:e=>{const r=new Set(this.get());e(r),this.set(r)}}));const W=typeof n=="object"&&"do"in n?n.do(()=>this.get(),(e,r)=>this.set(e,r)):{};if(this.do={...W,...f},this.reset=()=>{this.set(s,!0),this.subscribers.forEach(this.invokeSubscriber,this)},n==null)return;let g=null,D=!0,k=!0,w=!1,m=s instanceof Set?e=>new Set(JSON.parse(e)):e=>JSON.parse(e),b=s instanceof Set?e=>{if(e instanceof Set)return JSON.stringify(Array.from(e));throw console.error(e),"The value is not Set instance"}:e=>JSON.stringify(e);if(typeof n=="string"?g=n:"storeKey"in n&&(D=n.warnOnDuplicateStoreKey??!0,k=n.listenStorageChanges??!0,g=n.storeKey,m=n.parseValue??m,b=n.stringifyValue??b,w=n.unchangable??w),g===null)return;const a=`atom/${g}`;let C=!0;if(this.get=()=>{if(this.get=()=>super.getValue(),C){C=!1;try{super.setValue(a in i?m(i[a]):s)}catch{console.warn("Invalid json value",i[a])}}return super.getValue()},this.save=e=>{if(e===s){this.reset();return}i[a]=b(e),p(a)},this.reset=()=>{delete i[a],this.set(s,!0)},D&&h[a]!==void 0&&console.warn("Duplicate Atom key",g),h[a]={},k)if(w){let e,r=!1;h[a].updateUnchangable=()=>{try{this.set(m(i[a]),!0)}catch{}},c[a]=()=>{r||(r=!0,i[a]=b(this.get()),clearTimeout(e),e=setTimeout(()=>r=!1,100))},N()}else h[a].updatable=e=>{if(e.newValue===null){this.reset();return}try{this.set(m(e.newValue))}catch{console.warn("Invalid json value",e.newValue)}}}get defaultValue(){return this._defaultValue}}const i=window.localStorage,h={},c={};window.addEventListener("storage",t=>{var s,n,u;t.key===null||t.newValue===t.oldValue||((s=c[t.key])==null||s.call(c),(u=(n=h[t.key])==null?void 0:n.updatable)==null||u.call(n,t))});const A=new BroadcastChannel("unchangableChanged");A.addEventListener("message",t=>{var s,n;(n=(s=h[t.data])==null?void 0:s.updateUnchangable)==null||n.call(s)});const p=t=>{A.postMessage(t)},j=i.setItem.bind(i),L=i.removeItem.bind(i),V=i.clear.bind(i);i.setItem=(t,s)=>{c[t]===void 0&&j.call(i,t,s)},i.removeItem=t=>{c[t]===void 0&&L.call(i,t)},i.clear=()=>{V(),S()};let y=i.length;const S=()=>{y!==i.length&&(y=i.length,Object.keys(c).forEach(t=>{t in i||(p(t),c[t]())}))},N=(()=>{let t=!1;return()=>{if(t)return;t=!0;let s;const n=()=>{clearInterval(s),s=setInterval(S,0),S()};n(),window.addEventListener("focus",()=>clearInterval(s),!0),window.addEventListener("focus",()=>clearInterval(s),!1),window.addEventListener("click",()=>clearInterval(s),!1),window.addEventListener("click",()=>clearInterval(s),!0),window.addEventListener("blur",n,!0)}})();(()=>{const t=n=>{var u;n in i||(u=c[n])==null||u.call(c)},s=()=>Object.keys(h).forEach(t);Object.defineProperty(window,"localStorage",{get:()=>(Promise.resolve().then(s),i)})})();const U=t=>t;let I=()=>{throw"call configureAtomaric() before all!"};const J=t=>I=t.useSyncExternalStore,E=t=>I(t.subscribe,t.get),T=t=>t.set,G=t=>t.setDeferred,M=t=>t.get,P=t=>t.do,B=t=>[E(t),T(t)],R=(t,s)=>new v(t,s);o.Atom=v,o.atom=R,o.configureAtomaric=J,o.useAtom=B,o.useAtomDo=P,o.useAtomGet=M,o.useAtomSet=T,o.useAtomSetDeferred=G,o.useAtomValue=E,Object.defineProperty(o,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "atomaric",
   "description": "Manage your project state",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "type": "module",
   "main": "./build/atomaric.umd.cjs",
   "module": "./build/atomaric.js",

package/types/model.d.ts

@@ -2,7 +2,7 @@ type Sunscriber<Value> = (value: Value) => void;
 
 export type AtomStoreKey = `${string}${string}:${string}${string}`;
 
-export type AtomOptions<Value, Actions extends Record<string, Function>> = {
+export type AtomOptions<Value, Actions extends Record<string, Function> = {}> = {
   /** **default: true** */
   warnOnDuplicateStoreKey?: boolean;
   /** will update value if localStorage value is changed
@@ -23,7 +23,7 @@ export type AtomOptions<Value, Actions extends Record<string, Function>> = {
       storeKey: AtomStoreKey;
     }
   | {
-      do: (get: () => Value, set: (value: Value) => void) => Actions;
+      do: (get: () => Value, set: (value: Value, isPreventSave?: boolean) => void) => Actions;
     }
 );
 
@@ -37,13 +37,41 @@ export type AtomSetDeferredMethod<Value> = (
 
 export type AtomSubscribeMethod<Value> = (subscriber: Sunscriber<Value>) => () => void;
 
-export type SetActions<Value> = {
-  add: (value: Value) => Set<Value>;
-  delete: (value: Value) => boolean;
+export type UpdateAction<Value> = {
+  update: (updater: (value: Value) => void) => void;
+};
+
+export type NumberActions<Value> = {
+  increment: (delta?: number) => void;
+};
+
+export type BooleanActions<Value> = {
+  toggle: () => void;
+};
+
+export type SetActions<Value> = UpdateAction<Value> & {
+  add: (value: Value) => void;
+  delete: (value: Value) => void;
   clear: () => void;
 };
 
-export class Atom<Value, Actions extends Record<string, Function>> {
+export type ArrayActions<Value> = UpdateAction<Value[]> & {
+  push: (value: Value) => void;
+  unshift: (value: Value) => void;
+  filter: (filter?: (value: Value, index: number, array: Value[]) => any) => void;
+};
+
+export type DefaultActions<Value> = Value extends Set<infer V>
+  ? SetActions<V>
+  : Value extends boolean
+  ? BooleanActions<Value>
+  : Value extends (infer Val)[]
+  ? ArrayActions<Val>
+  : Value extends number
+  ? NumberActions<Value>
+  : {};
+
+export class Atom<Value, Actions extends Record<string, Function> = {}> {
   constructor(defaultValue: Value, storeKeyOrOptions: AtomStoreKey | undefined | AtomOptions<Value, Actions>);
 
   readonly defaultValue: Value;
@@ -51,26 +79,23 @@ export class Atom<Value, Actions extends Record<string, Function>> {
   readonly set: AtomSetMethod<Value>;
   readonly setDeferred: AtomSetDeferredMethod<Value>;
   readonly reset: () => void;
-  readonly toggle: () => void;
-  readonly inkrement: (delta: number) => void;
   readonly subscribe: AtomSubscribeMethod<Value>;
-  do: Actions & (Value extends Set<infer V> ? SetActions<V> : {});
+  do: Actions & DefaultActions<Value>;
 }
 
 export function useAtomValue<Value>(atom: Atom<Value>): Value;
 export function useAtomSet<Value>(atom: Atom<Value>): (typeof atom)['set'];
 export function useAtomSetDeferred<Value>(atom: Atom<Value>): (typeof atom)['setDeferred'];
 export function useAtomGet<Value>(atom: Atom<Value>): (typeof atom)['get'];
-export function useAtomToggle(atom: Atom<boolean>): (typeof atom)['toggle'];
-export function useAtomInkrement(atom: Atom<number>): (typeof atom)['inkrement'];
+export function useAtomDo<Value>(atom: Atom<Value>): (typeof atom)['do'];
 
 export function useAtom<Value>(atom: Atom<Value>): [Value, (typeof atom)['set']];
 
-export type StoreKeyOrOptions<Value, Actions extends Record<string, Function>> =
+export type StoreKeyOrOptions<Value, Actions extends Record<string, Function> = {}> =
   | `${string}${string}:${string}${string}`
   | AtomOptions<Value, Actions>;
 
-export function atom<Value, Actions extends Record<string, Function>>(
+export function atom<Value, Actions extends Record<string, Function> = {}>(
   value: Value,
   storeKeyOrOptions?: StoreKeyOrOptions<Value, Actions>,
 ): Atom<Value, Actions>;