@citruslime/vue-utils 2.0.2-beta.1 → 2.0.2-beta.3

package/dist/citrus-lime-vue-utils.es.js

@@ -1,300 +1,305 @@
-import { replacePlaceholders as Y } from "@citruslime/utils";
-import { toRef as ae, readonly as J, customRef as ue, ref as H, getCurrentScope as le, onScopeDispose as se, unref as ce, watch as W, nextTick as Z, isRef as ne, shallowRef as q, computed as fe } from "vue";
-const Ee = [
+import { replacePlaceholders as X } from "@citruslime/utils";
+import { shallowRef as E, readonly as W, toRef as ae, ref as ie, customRef as le, toValue as P, getCurrentScope as se, onScopeDispose as ue, watch as M, nextTick as Y, isRef as te, computed as ce } from "vue";
+const Oe = [
   "GET",
   "POST",
   "PUT",
   "DELETE"
 ];
-function Pe(e, t, u = null, l = null) {
+function Ee(e, t, i = null, s = null) {
   return {
     url: e,
     type: t,
-    headers: u ?? oe,
-    hasBody: de(t, l)
+    headers: i ?? ne,
+    hasBody: fe(t, s)
   };
 }
-function oe() {
+function ne() {
   return {
     accept: "application/json",
     "content-type": "application/json"
   };
 }
-function de(e, t) {
+function fe(e, t) {
   return !!(t === null && (e === "PUT" || e === "POST") || t);
 }
-function re(e) {
-  return le() ? (se(e), !0) : !1;
+function oe(e) {
+  return se() ? (ue(e), !0) : !1;
 }
 function I() {
-  const e = /* @__PURE__ */ new Set(), t = (a) => {
-    e.delete(a);
+  const e = /* @__PURE__ */ new Set(), t = (o) => {
+    e.delete(o);
   };
   return {
-    on: (a) => {
-      e.add(a);
-      const n = () => t(a);
-      return re(n), {
+    on: (o) => {
+      e.add(o);
+      const n = () => t(o);
+      return oe(n), {
         off: n
       };
     },
     off: t,
-    trigger: (...a) => Promise.all(Array.from(e).map((n) => n(...a)))
+    trigger: (...o) => Promise.all(Array.from(e).map((n) => n(...o))),
+    clear: () => {
+      e.clear();
+    }
   };
 }
-function P(e) {
-  return typeof e == "function" ? e() : ce(e);
-}
-const ie = typeof window < "u" && typeof document < "u";
+const re = typeof window < "u" && typeof document < "u";
 typeof WorkerGlobalScope < "u" && globalThis instanceof WorkerGlobalScope;
-const pe = () => {
+const de = () => {
 };
-function ee(e, t = !1, u = "Timeout") {
-  return new Promise((l, a) => {
-    setTimeout(t ? () => a(u) : l, e);
-  });
-}
-function he(e, ...t) {
-  return t.some((u) => u in e);
-}
 function L(...e) {
   if (e.length !== 1)
     return ae(...e);
   const t = e[0];
-  return typeof t == "function" ? J(ue(() => ({ get: t, set: pe }))) : H(t);
+  return typeof t == "function" ? W(le(() => ({ get: t, set: de }))) : ie(t);
+}
+function Z(e, t = !1, i = "Timeout") {
+  return new Promise((s, y) => {
+    setTimeout(t ? () => y(i) : s, e);
+  });
+}
+function pe(e, ...t) {
+  return t.some((i) => i in e);
 }
 function z(e, t = !1) {
-  function u(o, { flush: f = "sync", deep: i = !1, timeout: h, throwOnTimeout: b } = {}) {
-    let y = null;
+  function i(r, { flush: c = "sync", deep: a = !1, timeout: p, throwOnTimeout: b } = {}) {
+    let h = null;
     const D = [new Promise((F) => {
-      y = W(
+      h = M(
         e,
         (w) => {
-          o(w) !== t && (y ? y() : Z(() => y == null ? void 0 : y()), F(w));
+          r(w) !== t && (h ? h() : Y(() => h == null ? void 0 : h()), F(w));
         },
         {
-          flush: f,
-          deep: i,
+          flush: c,
+          deep: a,
           immediate: !0
         }
       );
     })];
-    return h != null && D.push(
-      ee(h, b).then(() => P(e)).finally(() => y == null ? void 0 : y())
+    return p != null && D.push(
+      Z(p, b).then(() => P(e)).finally(() => h == null ? void 0 : h())
     ), Promise.race(D);
   }
-  function l(o, f) {
-    if (!ne(o))
-      return u((w) => w === o, f);
-    const { flush: i = "sync", deep: h = !1, timeout: b, throwOnTimeout: y } = f ?? {};
-    let m = null;
+  function s(r, c) {
+    if (!te(r))
+      return i((w) => w === r, c);
+    const { flush: a = "sync", deep: p = !1, timeout: b, throwOnTimeout: h } = c ?? {};
+    let T = null;
     const F = [new Promise((w) => {
-      m = W(
-        [e, o],
+      T = M(
+        [e, r],
         ([O, j]) => {
-          t !== (O === j) && (m ? m() : Z(() => m == null ? void 0 : m()), w(O));
+          t !== (O === j) && (T ? T() : Y(() => T == null ? void 0 : T()), w(O));
         },
         {
-          flush: i,
-          deep: h,
+          flush: a,
+          deep: p,
           immediate: !0
         }
       );
     })];
     return b != null && F.push(
-      ee(b, y).then(() => P(e)).finally(() => (m == null || m(), P(e)))
+      Z(b, h).then(() => P(e)).finally(() => (T == null || T(), P(e)))
     ), Promise.race(F);
   }
-  function a(o) {
-    return u((f) => !!f, o);
+  function y(r) {
+    return i((c) => !!c, r);
   }
-  function n(o) {
-    return l(null, o);
+  function o(r) {
+    return s(null, r);
   }
-  function r(o) {
-    return l(void 0, o);
+  function n(r) {
+    return s(void 0, r);
   }
-  function p(o) {
-    return u(Number.isNaN, o);
+  function d(r) {
+    return i(Number.isNaN, r);
   }
-  function g(o, f) {
-    return u((i) => {
-      const h = Array.from(i);
-      return h.includes(o) || h.includes(P(o));
-    }, f);
+  function g(r, c) {
+    return i((a) => {
+      const p = Array.from(a);
+      return p.includes(r) || p.includes(P(r));
+    }, c);
   }
-  function s(o) {
-    return T(1, o);
+  function l(r) {
+    return m(1, r);
   }
-  function T(o = 1, f) {
-    let i = -1;
-    return u(() => (i += 1, i >= o), f);
+  function m(r = 1, c) {
+    let a = -1;
+    return i(() => (a += 1, a >= r), c);
   }
   return Array.isArray(P(e)) ? {
-    toMatch: u,
+    toMatch: i,
     toContains: g,
-    changed: s,
-    changedTimes: T,
+    changed: l,
+    changedTimes: m,
     get not() {
       return z(e, !t);
     }
   } : {
-    toMatch: u,
-    toBe: l,
-    toBeTruthy: a,
-    toBeNull: n,
-    toBeNaN: p,
-    toBeUndefined: r,
-    changed: s,
-    changedTimes: T,
+    toMatch: i,
+    toBe: s,
+    toBeTruthy: y,
+    toBeNull: o,
+    toBeNaN: d,
+    toBeUndefined: n,
+    changed: l,
+    changedTimes: m,
     get not() {
       return z(e, !t);
     }
   };
 }
-function ye(e) {
+function he(e) {
   return z(e);
 }
-function me(e, t, u = {}) {
+function ye(e, t, i = {}) {
   const {
-    immediate: l = !0
-  } = u, a = H(!1);
+    immediate: s = !0,
+    immediateCallback: y = !1
+  } = i, o = E(!1);
   let n = null;
-  function r() {
+  function d() {
     n && (clearTimeout(n), n = null);
   }
-  function p() {
-    a.value = !1, r();
+  function g() {
+    o.value = !1, d();
   }
-  function g(...s) {
-    r(), a.value = !0, n = setTimeout(() => {
-      a.value = !1, n = null, e(...s);
+  function l(...m) {
+    y && e(), d(), o.value = !0, n = setTimeout(() => {
+      o.value = !1, n = null, e(...m);
     }, P(t));
   }
-  return l && (a.value = !0, ie && g()), re(p), {
-    isPending: J(a),
-    start: g,
-    stop: p
+  return s && (o.value = !0, re && l()), oe(g), {
+    isPending: W(o),
+    start: l,
+    stop: g
   };
 }
-const Te = ie ? window : void 0, ve = {
+const me = re ? window : void 0, Te = {
   json: "application/json",
   text: "text/plain"
 };
-function te(e) {
-  return e && he(e, "immediate", "refetch", "initialData", "timeout", "beforeFetch", "afterFetch", "onFetchError", "fetch", "updateDataOnError");
+function ee(e) {
+  return e && pe(e, "immediate", "refetch", "initialData", "timeout", "beforeFetch", "afterFetch", "onFetchError", "fetch", "updateDataOnError");
 }
 function V(e) {
   return typeof Headers < "u" && e instanceof Headers ? Object.fromEntries(e.entries()) : e;
 }
-function ge(e, ...t) {
-  var u;
-  const l = typeof AbortController == "function";
-  let a = {}, n = {
+function ve(e, ...t) {
+  var i;
+  const s = typeof AbortController == "function";
+  let y = {}, o = {
     immediate: !0,
     refetch: !1,
     timeout: 0,
     updateDataOnError: !1
   };
-  const r = {
+  const n = {
     method: "GET",
     type: "text",
     payload: void 0
   };
-  t.length > 0 && (te(t[0]) ? n = { ...n, ...t[0] } : a = t[0]), t.length > 1 && te(t[1]) && (n = { ...n, ...t[1] });
+  t.length > 0 && (ee(t[0]) ? o = { ...o, ...t[0] } : y = t[0]), t.length > 1 && ee(t[1]) && (o = { ...o, ...t[1] });
   const {
-    fetch: p = (u = Te) == null ? void 0 : u.fetch,
+    fetch: d = (i = me) == null ? void 0 : i.fetch,
     initialData: g,
-    timeout: s
-  } = n, T = I(), o = I(), f = I(), i = H(!1), h = H(!1), b = H(!1), y = H(null), m = q(null), D = q(null), F = q(g || null), w = fe(() => l && h.value);
+    timeout: l
+  } = o, m = I(), r = I(), c = I(), a = E(!1), p = E(!1), b = E(!1), h = E(null), T = E(null), D = E(null), F = E(g || null), w = ce(() => s && p.value);
   let O, j;
-  const M = () => {
-    l && (O == null || O.abort(), O = new AbortController(), O.signal.onabort = () => b.value = !0, a = {
-      ...a,
+  const _ = () => {
+    s && (O == null || O.abort(), O = new AbortController(), O.signal.onabort = () => b.value = !0, y = {
+      ...y,
       signal: O.signal
     });
-  }, _ = (d) => {
-    h.value = d, i.value = !d;
+  }, $ = (f) => {
+    p.value = f, a.value = !f;
   };
-  s && (j = me(M, s, { immediate: !1 }));
-  let $ = 0;
-  const k = async (d = !1) => {
-    var v, C;
-    M(), _(!0), D.value = null, y.value = null, b.value = !1, $ += 1;
-    const x = $, S = {
-      method: r.method,
+  l && (j = ye(_, l, { immediate: !1 }));
+  let K = 0;
+  const H = async (f = !1) => {
+    var v, N;
+    _(), $(!0), D.value = null, h.value = null, b.value = !1, K += 1;
+    const U = K, S = {
+      method: n.method,
       headers: {}
-    };
-    if (r.payload) {
-      const c = V(S.headers), E = P(r.payload), X = Object.getPrototypeOf(E);
-      !r.payloadType && E && (X === Object.prototype || Array.isArray(X)) && !(E instanceof FormData) && (r.payloadType = "json"), r.payloadType && (c["Content-Type"] = (v = ve[r.payloadType]) != null ? v : r.payloadType), S.body = r.payloadType === "json" ? JSON.stringify(E) : E;
+    }, x = P(n.payload);
+    if (x) {
+      const u = V(S.headers), G = Object.getPrototypeOf(x);
+      !n.payloadType && x && (G === Object.prototype || Array.isArray(G)) && !(x instanceof FormData) && (n.payloadType = "json"), n.payloadType && (u["Content-Type"] = (v = Te[n.payloadType]) != null ? v : n.payloadType), S.body = n.payloadType === "json" ? JSON.stringify(x) : x;
     }
     let R = !1;
-    const U = {
+    const C = {
       url: P(e),
       options: {
         ...S,
-        ...a
+        ...y
       },
       cancel: () => {
         R = !0;
       }
     };
-    if (n.beforeFetch && Object.assign(U, await n.beforeFetch(U)), R || !p)
-      return _(!1), Promise.resolve(null);
+    if (o.beforeFetch && Object.assign(C, await o.beforeFetch(C)), R || !d)
+      return $(!1), Promise.resolve(null);
     let B = null;
-    return j && j.start(), p(
-      U.url,
+    return j && j.start(), d(
+      C.url,
       {
         ...S,
-        ...U.options,
+        ...C.options,
         headers: {
           ...V(S.headers),
-          ...V((C = U.options) == null ? void 0 : C.headers)
+          ...V((N = C.options) == null ? void 0 : N.headers)
         }
       }
-    ).then(async (c) => {
-      if (m.value = c, y.value = c.status, B = await c.clone()[r.type](), !c.ok)
-        throw F.value = g || null, new Error(c.statusText);
-      return n.afterFetch && ({ data: B } = await n.afterFetch({
+    ).then(async (u) => {
+      if (T.value = u, h.value = u.status, B = await u.clone()[n.type](), !u.ok)
+        throw F.value = g || null, new Error(u.statusText);
+      return o.afterFetch && ({ data: B } = await o.afterFetch({
         data: B,
-        response: c
-      })), F.value = B, T.trigger(c), c;
-    }).catch(async (c) => {
-      let E = c.message || c.name;
-      if (n.onFetchError && ({ error: E, data: B } = await n.onFetchError({
+        response: u,
+        context: C,
+        execute: H
+      })), F.value = B, m.trigger(u), u;
+    }).catch(async (u) => {
+      let G = u.message || u.name;
+      if (o.onFetchError && ({ error: G, data: B } = await o.onFetchError({
         data: B,
-        error: c,
-        response: m.value
-      })), D.value = E, n.updateDataOnError && (F.value = B), o.trigger(c), d)
-        throw c;
+        error: u,
+        response: T.value,
+        context: C,
+        execute: H
+      })), D.value = G, o.updateDataOnError && (F.value = B), r.trigger(u), f)
+        throw u;
       return null;
     }).finally(() => {
-      x === $ && _(!1), j && j.stop(), f.trigger(null);
+      U === K && $(!1), j && j.stop(), c.trigger(null);
     });
-  }, Q = L(n.refetch);
-  W(
+  }, Q = L(o.refetch);
+  M(
     [
       Q,
       L(e)
     ],
-    ([d]) => d && k(),
+    ([f]) => f && H(),
     { deep: !0 }
   );
-  const G = {
-    isFinished: J(i),
-    isFetching: J(h),
-    statusCode: y,
-    response: m,
+  const J = {
+    isFinished: W(a),
+    isFetching: W(p),
+    statusCode: h,
+    response: T,
     error: D,
     data: F,
     canAbort: w,
     aborted: b,
-    abort: M,
-    execute: k,
-    onFetchResponse: T.on,
-    onFetchError: o.on,
-    onFetchFinally: f.on,
+    abort: _,
+    execute: H,
+    onFetchResponse: m.on,
+    onFetchError: r.on,
+    onFetchFinally: c.on,
     // method
     get: A("GET"),
     put: A("PUT"),
@@ -304,104 +309,104 @@ function ge(e, ...t) {
     head: A("HEAD"),
     options: A("OPTIONS"),
     // type
-    json: N("json"),
-    text: N("text"),
-    blob: N("blob"),
-    arrayBuffer: N("arrayBuffer"),
-    formData: N("formData")
+    json: k("json"),
+    text: k("text"),
+    blob: k("blob"),
+    arrayBuffer: k("arrayBuffer"),
+    formData: k("formData")
   };
-  function A(d) {
-    return (v, C) => {
-      if (!h.value)
-        return r.method = d, r.payload = v, r.payloadType = C, ne(r.payload) && W(
+  function A(f) {
+    return (v, N) => {
+      if (!p.value)
+        return n.method = f, n.payload = v, n.payloadType = N, te(n.payload) && M(
           [
             Q,
-            L(r.payload)
+            L(n.payload)
           ],
-          ([x]) => x && k(),
+          ([U]) => U && H(),
           { deep: !0 }
         ), {
-          ...G,
-          then(x, S) {
-            return K().then(x, S);
+          ...J,
+          then(U, S) {
+            return q().then(U, S);
           }
         };
     };
   }
-  function K() {
-    return new Promise((d, v) => {
-      ye(i).toBe(!0).then(() => d(G)).catch(v);
+  function q() {
+    return new Promise((f, v) => {
+      he(a).toBe(!0).then(() => f(J)).catch(v);
     });
   }
-  function N(d) {
+  function k(f) {
     return () => {
-      if (!h.value)
-        return r.type = d, {
-          ...G,
-          then(v, C) {
-            return K().then(v, C);
+      if (!p.value)
+        return n.type = f, {
+          ...J,
+          then(v, N) {
+            return q().then(v, N);
           }
         };
     };
   }
-  return n.immediate && Promise.resolve().then(() => k()), {
-    ...G,
-    then(d, v) {
-      return K().then(d, v);
+  return o.immediate && Promise.resolve().then(() => H()), {
+    ...J,
+    then(f, v) {
+      return q().then(f, v);
     }
   };
 }
-function De(e, t, u = "/api/") {
-  const l = {};
-  return Object.keys(e).forEach((n) => {
-    l[n] = (...r) => {
-      const p = e[n], g = p.type;
-      let s = p.url;
-      s.startsWith("http") || (s = `${u}${s}`), p.hasBody ? s = Y(s, ...r.splice(1)) : s = Y(s, ...r);
-      const T = {
-        ...oe(),
-        ...p.headers()
+function Pe(e, t, i = "/api/") {
+  const s = {};
+  return Object.keys(e).forEach((o) => {
+    s[o] = (...n) => {
+      const d = e[o], g = d.type;
+      let l = d.url;
+      l.startsWith("http") || (l = `${i}${l}`), d.hasBody ? l = X(l, ...n.splice(1)) : l = X(l, ...n);
+      const m = {
+        ...ne(),
+        ...d.headers()
       };
-      Fe(T);
-      const o = ge(
-        s,
+      ge(m);
+      const r = ve(
+        l,
         {
           method: g
         },
         {
           immediate: !1,
-          beforeFetch({ options: i }) {
-            return i.headers = {
-              ...i.headers,
-              ...T
-            }, p.hasBody && r.length && (i.body = JSON.stringify(r[0])), {
-              options: i
+          beforeFetch({ options: a }) {
+            return a.headers = {
+              ...a.headers,
+              ...m
+            }, d.hasBody && n.length && (a.body = JSON.stringify(n[0])), {
+              options: a
             };
           },
-          onFetchError(i) {
-            return i != null && i.response && t(i), i;
+          onFetchError(a) {
+            return a != null && a.response && t(a), a;
           }
         }
       );
       return {
-        ...be(T) === "application/json" ? o.json() : o.text()
+        ...Fe(m) === "application/json" ? r.json() : r.text()
       };
     };
-  }), l;
+  }), s;
 }
-function Fe(e) {
+function ge(e) {
   e["content-type"] === "multipart/form-data" && delete e["content-type"];
 }
-function be(e) {
+function Fe(e) {
   return e.accept ?? "*/*";
 }
-function je(e) {
+function De(e) {
   return JSON.parse(JSON.stringify(e));
 }
 export {
-  je as copy,
-  Pe as createEndpoint,
-  oe as getDefaultHeaders,
-  Ee as requestTypes,
-  De as useApi
+  De as copy,
+  Ee as createEndpoint,
+  ne as getDefaultHeaders,
+  Oe as requestTypes,
+  Pe as useApi
 };

package/dist/citrus-lime-vue-utils.umd.js

@@ -1 +1 @@
-(function(T,N){typeof exports=="object"&&typeof module<"u"?N(exports,require("@citruslime/utils"),require("vue")):typeof define=="function"&&define.amd?define(["exports","@citruslime/utils","vue"],N):(T=typeof globalThis<"u"?globalThis:T||self,N(T.CitrusLimeVueUtils={},T.CLUtils,T.Vue))})(this,function(T,N,r){"use strict";const ne=["GET","POST","PUT","DELETE"];function oe(e,t,s=null,u=null){return{url:e,type:t,headers:s??M,hasBody:re(t,u)}}function M(){return{accept:"application/json","content-type":"application/json"}}function re(e,t){return!!(t===null&&(e==="PUT"||e==="POST")||t)}function z(e){return r.getCurrentScope()?(r.onScopeDispose(e),!0):!1}function W(){const e=new Set,t=l=>{e.delete(l)};return{on:l=>{e.add(l);const n=()=>t(l);return z(n),{off:n}},off:t,trigger:(...l)=>Promise.all(Array.from(e).map(n=>n(...l)))}}function E(e){return typeof e=="function"?e():r.unref(e)}const Q=typeof window<"u"&&typeof document<"u";typeof WorkerGlobalScope<"u"&&globalThis instanceof WorkerGlobalScope;const ie=()=>{};function X(e,t=!1,s="Timeout"){return new Promise((u,l)=>{setTimeout(t?()=>l(s):u,e)})}function ae(e,...t){return t.some(s=>s in e)}function L(...e){if(e.length!==1)return r.toRef(...e);const t=e[0];return typeof t=="function"?r.readonly(r.customRef(()=>({get:t,set:ie}))):r.ref(t)}function V(e,t=!1){function s(o,{flush:d="sync",deep:a=!1,timeout:y,throwOnTimeout:P}={}){let m=null;const A=[new Promise(O=>{m=r.watch(e,D=>{o(D)!==t&&(m?m():r.nextTick(()=>m==null?void 0:m()),O(D))},{flush:d,deep:a,immediate:!0})})];return y!=null&&A.push(X(y,P).then(()=>E(e)).finally(()=>m==null?void 0:m())),Promise.race(A)}function u(o,d){if(!r.isRef(o))return s(D=>D===o,d);const{flush:a="sync",deep:y=!1,timeout:P,throwOnTimeout:m}=d??{};let g=null;const O=[new Promise(D=>{g=r.watch([e,o],([j,C])=>{t!==(j===C)&&(g?g():r.nextTick(()=>g==null?void 0:g()),D(j))},{flush:a,deep:y,immediate:!0})})];return P!=null&&O.push(X(P,m).then(()=>E(e)).finally(()=>(g==null||g(),E(e)))),Promise.race(O)}function l(o){return s(d=>!!d,o)}function n(o){return u(null,o)}function i(o){return u(void 0,o)}function h(o){return s(Number.isNaN,o)}function F(o,d){return s(a=>{const y=Array.from(a);return y.includes(o)||y.includes(E(o))},d)}function c(o){return w(1,o)}function w(o=1,d){let a=-1;return s(()=>(a+=1,a>=o),d)}return Array.isArray(E(e))?{toMatch:s,toContains:F,changed:c,changedTimes:w,get not(){return V(e,!t)}}:{toMatch:s,toBe:u,toBeTruthy:l,toBeNull:n,toBeNaN:h,toBeUndefined:i,changed:c,changedTimes:w,get not(){return V(e,!t)}}}function le(e){return V(e)}function se(e,t,s={}){const{immediate:u=!0}=s,l=r.ref(!1);let n=null;function i(){n&&(clearTimeout(n),n=null)}function h(){l.value=!1,i()}function F(...c){i(),l.value=!0,n=setTimeout(()=>{l.value=!1,n=null,e(...c)},E(t))}return u&&(l.value=!0,Q&&F()),z(h),{isPending:r.readonly(l),start:F,stop:h}}const ue=Q?window:void 0,ce={json:"application/json",text:"text/plain"};function Y(e){return e&&ae(e,"immediate","refetch","initialData","timeout","beforeFetch","afterFetch","onFetchError","fetch","updateDataOnError")}function _(e){return typeof Headers<"u"&&e instanceof Headers?Object.fromEntries(e.entries()):e}function fe(e,...t){var s;const u=typeof AbortController=="function";let l={},n={immediate:!0,refetch:!1,timeout:0,updateDataOnError:!1};const i={method:"GET",type:"text",payload:void 0};t.length>0&&(Y(t[0])?n={...n,...t[0]}:l=t[0]),t.length>1&&Y(t[1])&&(n={...n,...t[1]});const{fetch:h=(s=ue)==null?void 0:s.fetch,initialData:F,timeout:c}=n,w=W(),o=W(),d=W(),a=r.ref(!1),y=r.ref(!1),P=r.ref(!1),m=r.ref(null),g=r.shallowRef(null),A=r.shallowRef(null),O=r.shallowRef(F||null),D=r.computed(()=>u&&y.value);let j,C;const K=()=>{u&&(j==null||j.abort(),j=new AbortController,j.signal.onabort=()=>P.value=!0,l={...l,signal:j.signal})},R=p=>{y.value=p,a.value=!p};c&&(C=se(K,c,{immediate:!1}));let $=0;const q=async(p=!1)=>{var b,U;K(),R(!0),A.value=null,m.value=null,P.value=!1,$+=1;const x=$,H={method:i.method,headers:{}};if(i.payload){const f=_(H.headers),S=E(i.payload),te=Object.getPrototypeOf(S);!i.payloadType&&S&&(te===Object.prototype||Array.isArray(te))&&!(S instanceof FormData)&&(i.payloadType="json"),i.payloadType&&(f["Content-Type"]=(b=ce[i.payloadType])!=null?b:i.payloadType),H.body=i.payloadType==="json"?JSON.stringify(S):S}let ee=!1;const G={url:E(e),options:{...H,...l},cancel:()=>{ee=!0}};if(n.beforeFetch&&Object.assign(G,await n.beforeFetch(G)),ee||!h)return R(!1),Promise.resolve(null);let v=null;return C&&C.start(),h(G.url,{...H,...G.options,headers:{..._(H.headers),..._((U=G.options)==null?void 0:U.headers)}}).then(async f=>{if(g.value=f,m.value=f.status,v=await f.clone()[i.type](),!f.ok)throw O.value=F||null,new Error(f.statusText);return n.afterFetch&&({data:v}=await n.afterFetch({data:v,response:f})),O.value=v,w.trigger(f),f}).catch(async f=>{let S=f.message||f.name;if(n.onFetchError&&({error:S,data:v}=await n.onFetchError({data:v,error:f,response:g.value})),A.value=S,n.updateDataOnError&&(O.value=v),o.trigger(f),p)throw f;return null}).finally(()=>{x===$&&R(!1),C&&C.stop(),d.trigger(null)})},Z=L(n.refetch);r.watch([Z,L(e)],([p])=>p&&q(),{deep:!0});const J={isFinished:r.readonly(a),isFetching:r.readonly(y),statusCode:m,response:g,error:A,data:O,canAbort:D,aborted:P,abort:K,execute:q,onFetchResponse:w.on,onFetchError:o.on,onFetchFinally:d.on,get:B("GET"),put:B("PUT"),post:B("POST"),delete:B("DELETE"),patch:B("PATCH"),head:B("HEAD"),options:B("OPTIONS"),json:k("json"),text:k("text"),blob:k("blob"),arrayBuffer:k("arrayBuffer"),formData:k("formData")};function B(p){return(b,U)=>{if(!y.value)return i.method=p,i.payload=b,i.payloadType=U,r.isRef(i.payload)&&r.watch([Z,L(i.payload)],([x])=>x&&q(),{deep:!0}),{...J,then(x,H){return I().then(x,H)}}}}function I(){return new Promise((p,b)=>{le(a).toBe(!0).then(()=>p(J)).catch(b)})}function k(p){return()=>{if(!y.value)return i.type=p,{...J,then(b,U){return I().then(b,U)}}}}return n.immediate&&Promise.resolve().then(()=>q()),{...J,then(p,b){return I().then(p,b)}}}function de(e,t,s="/api/"){const u={};return Object.keys(e).forEach(n=>{u[n]=(...i)=>{const h=e[n],F=h.type;let c=h.url;c.startsWith("http")||(c=`${s}${c}`),h.hasBody?c=N.replacePlaceholders(c,...i.splice(1)):c=N.replacePlaceholders(c,...i);const w={...M(),...h.headers()};pe(w);const o=fe(c,{method:F},{immediate:!1,beforeFetch({options:a}){return a.headers={...a.headers,...w},h.hasBody&&i.length&&(a.body=JSON.stringify(i[0])),{options:a}},onFetchError(a){return a!=null&&a.response&&t(a),a}});return{...he(w)==="application/json"?o.json():o.text()}}}),u}function pe(e){e["content-type"]==="multipart/form-data"&&delete e["content-type"]}function he(e){return e.accept??"*/*"}function ye(e){return JSON.parse(JSON.stringify(e))}T.copy=ye,T.createEndpoint=oe,T.getDefaultHeaders=M,T.requestTypes=ne,T.useApi=de,Object.defineProperty(T,Symbol.toStringTag,{value:"Module"})});
+(function(m,V){typeof exports=="object"&&typeof module<"u"?V(exports,require("@citruslime/utils"),require("vue")):typeof define=="function"&&define.amd?define(["exports","@citruslime/utils","vue"],V):(m=typeof globalThis<"u"?globalThis:m||self,V(m.CitrusLimeVueUtils={},m.CLUtils,m.Vue))})(this,function(m,V,t){"use strict";const te=["GET","POST","PUT","DELETE"];function ne(e,n,l=null,u=null){return{url:e,type:n,headers:l??J,hasBody:oe(n,u)}}function J(){return{accept:"application/json","content-type":"application/json"}}function oe(e,n){return!!(n===null&&(e==="PUT"||e==="POST")||n)}function z(e){return t.getCurrentScope()?(t.onScopeDispose(e),!0):!1}function M(){const e=new Set,n=r=>{e.delete(r)};return{on:r=>{e.add(r);const o=()=>n(r);return z(o),{off:o}},off:n,trigger:(...r)=>Promise.all(Array.from(e).map(o=>o(...r))),clear:()=>{e.clear()}}}const Q=typeof window<"u"&&typeof document<"u";typeof WorkerGlobalScope<"u"&&globalThis instanceof WorkerGlobalScope;const re=()=>{};function W(...e){if(e.length!==1)return t.toRef(...e);const n=e[0];return typeof n=="function"?t.readonly(t.customRef(()=>({get:n,set:re}))):t.ref(n)}function X(e,n=!1,l="Timeout"){return new Promise((u,T)=>{setTimeout(n?()=>T(l):u,e)})}function ie(e,...n){return n.some(l=>l in e)}function v(e,n=!1){function l(i,{flush:f="sync",deep:a=!1,timeout:h,throwOnTimeout:E}={}){let y=null;const j=[new Promise(O=>{y=t.watch(e,P=>{i(P)!==n&&(y?y():t.nextTick(()=>y==null?void 0:y()),O(P))},{flush:f,deep:a,immediate:!0})})];return h!=null&&j.push(X(h,E).then(()=>t.toValue(e)).finally(()=>y==null?void 0:y())),Promise.race(j)}function u(i,f){if(!t.isRef(i))return l(P=>P===i,f);const{flush:a="sync",deep:h=!1,timeout:E,throwOnTimeout:y}=f??{};let g=null;const O=[new Promise(P=>{g=t.watch([e,i],([D,S])=>{n!==(D===S)&&(g?g():t.nextTick(()=>g==null?void 0:g()),P(D))},{flush:a,deep:h,immediate:!0})})];return E!=null&&O.push(X(E,y).then(()=>t.toValue(e)).finally(()=>(g==null||g(),t.toValue(e)))),Promise.race(O)}function T(i){return l(f=>!!f,i)}function r(i){return u(null,i)}function o(i){return u(void 0,i)}function p(i){return l(Number.isNaN,i)}function F(i,f){return l(a=>{const h=Array.from(a);return h.includes(i)||h.includes(t.toValue(i))},f)}function s(i){return w(1,i)}function w(i=1,f){let a=-1;return l(()=>(a+=1,a>=i),f)}return Array.isArray(t.toValue(e))?{toMatch:l,toContains:F,changed:s,changedTimes:w,get not(){return v(e,!n)}}:{toMatch:l,toBe:u,toBeTruthy:T,toBeNull:r,toBeNaN:p,toBeUndefined:o,changed:s,changedTimes:w,get not(){return v(e,!n)}}}function ae(e){return v(e)}function le(e,n,l={}){const{immediate:u=!0,immediateCallback:T=!1}=l,r=t.shallowRef(!1);let o=null;function p(){o&&(clearTimeout(o),o=null)}function F(){r.value=!1,p()}function s(...w){T&&e(),p(),r.value=!0,o=setTimeout(()=>{r.value=!1,o=null,e(...w)},t.toValue(n))}return u&&(r.value=!0,Q&&s()),z(F),{isPending:t.readonly(r),start:s,stop:F}}const se=Q?window:void 0,ue={json:"application/json",text:"text/plain"};function Y(e){return e&&ie(e,"immediate","refetch","initialData","timeout","beforeFetch","afterFetch","onFetchError","fetch","updateDataOnError")}function L(e){return typeof Headers<"u"&&e instanceof Headers?Object.fromEntries(e.entries()):e}function ce(e,...n){var l;const u=typeof AbortController=="function";let T={},r={immediate:!0,refetch:!1,timeout:0,updateDataOnError:!1};const o={method:"GET",type:"text",payload:void 0};n.length>0&&(Y(n[0])?r={...r,...n[0]}:T=n[0]),n.length>1&&Y(n[1])&&(r={...r,...n[1]});const{fetch:p=(l=se)==null?void 0:l.fetch,initialData:F,timeout:s}=r,w=M(),i=M(),f=M(),a=t.shallowRef(!1),h=t.shallowRef(!1),E=t.shallowRef(!1),y=t.shallowRef(null),g=t.shallowRef(null),j=t.shallowRef(null),O=t.shallowRef(F||null),P=t.computed(()=>u&&h.value);let D,S;const _=()=>{u&&(D==null||D.abort(),D=new AbortController,D.signal.onabort=()=>E.value=!0,T={...T,signal:D.signal})},K=d=>{h.value=d,a.value=!d};s&&(S=le(_,s,{immediate:!1}));let $=0;const N=async(d=!1)=>{var b,U;_(),K(!0),j.value=null,y.value=null,E.value=!1,$+=1;const x=$,C={method:o.method,headers:{}},k=t.toValue(o.payload);if(k){const c=L(C.headers),G=Object.getPrototypeOf(k);!o.payloadType&&k&&(G===Object.prototype||Array.isArray(G))&&!(k instanceof FormData)&&(o.payloadType="json"),o.payloadType&&(c["Content-Type"]=(b=ue[o.payloadType])!=null?b:o.payloadType),C.body=o.payloadType==="json"?JSON.stringify(k):k}let ee=!1;const B={url:t.toValue(e),options:{...C,...T},cancel:()=>{ee=!0}};if(r.beforeFetch&&Object.assign(B,await r.beforeFetch(B)),ee||!p)return K(!1),Promise.resolve(null);let H=null;return S&&S.start(),p(B.url,{...C,...B.options,headers:{...L(C.headers),...L((U=B.options)==null?void 0:U.headers)}}).then(async c=>{if(g.value=c,y.value=c.status,H=await c.clone()[o.type](),!c.ok)throw O.value=F||null,new Error(c.statusText);return r.afterFetch&&({data:H}=await r.afterFetch({data:H,response:c,context:B,execute:N})),O.value=H,w.trigger(c),c}).catch(async c=>{let G=c.message||c.name;if(r.onFetchError&&({error:G,data:H}=await r.onFetchError({data:H,error:c,response:g.value,context:B,execute:N})),j.value=G,r.updateDataOnError&&(O.value=H),i.trigger(c),d)throw c;return null}).finally(()=>{x===$&&K(!1),S&&S.stop(),f.trigger(null)})},Z=W(r.refetch);t.watch([Z,W(e)],([d])=>d&&N(),{deep:!0});const q={isFinished:t.readonly(a),isFetching:t.readonly(h),statusCode:y,response:g,error:j,data:O,canAbort:P,aborted:E,abort:_,execute:N,onFetchResponse:w.on,onFetchError:i.on,onFetchFinally:f.on,get:A("GET"),put:A("PUT"),post:A("POST"),delete:A("DELETE"),patch:A("PATCH"),head:A("HEAD"),options:A("OPTIONS"),json:R("json"),text:R("text"),blob:R("blob"),arrayBuffer:R("arrayBuffer"),formData:R("formData")};function A(d){return(b,U)=>{if(!h.value)return o.method=d,o.payload=b,o.payloadType=U,t.isRef(o.payload)&&t.watch([Z,W(o.payload)],([x])=>x&&N(),{deep:!0}),{...q,then(x,C){return I().then(x,C)}}}}function I(){return new Promise((d,b)=>{ae(a).toBe(!0).then(()=>d(q)).catch(b)})}function R(d){return()=>{if(!h.value)return o.type=d,{...q,then(b,U){return I().then(b,U)}}}}return r.immediate&&Promise.resolve().then(()=>N()),{...q,then(d,b){return I().then(d,b)}}}function fe(e,n,l="/api/"){const u={};return Object.keys(e).forEach(r=>{u[r]=(...o)=>{const p=e[r],F=p.type;let s=p.url;s.startsWith("http")||(s=`${l}${s}`),p.hasBody?s=V.replacePlaceholders(s,...o.splice(1)):s=V.replacePlaceholders(s,...o);const w={...J(),...p.headers()};de(w);const i=ce(s,{method:F},{immediate:!1,beforeFetch({options:a}){return a.headers={...a.headers,...w},p.hasBody&&o.length&&(a.body=JSON.stringify(o[0])),{options:a}},onFetchError(a){return a!=null&&a.response&&n(a),a}});return{...pe(w)==="application/json"?i.json():i.text()}}}),u}function de(e){e["content-type"]==="multipart/form-data"&&delete e["content-type"]}function pe(e){return e.accept??"*/*"}function he(e){return JSON.parse(JSON.stringify(e))}m.copy=he,m.createEndpoint=ne,m.getDefaultHeaders=J,m.requestTypes=te,m.useApi=fe,Object.defineProperty(m,Symbol.toStringTag,{value:"Module"})});

package/dist/utils/api/factory.d.ts

@@ -10,7 +10,7 @@ export type ApiRequest<TResponseModel> = ReturnType<typeof useFetch<TResponseMod
  * @returns An API object containing request methods.
  */
 export declare function useApi<TEndpoint extends Record<keyof TEndpoint, Endpoint>>(endpoints: TEndpoint, handleFetchErrorResponse: (context: {
-    data: any;
+    data: unknown;
     response: Response | null;
-    error: any;
+    error: unknown;
 }) => void, prefix?: string): Record<keyof TEndpoint, <TResponseModel>(...values: unknown[]) => ApiRequest<TResponseModel>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citruslime/vue-utils",
-  "version": "2.0.2-beta.1",
+  "version": "2.0.2-beta.3",
   "type": "module",
   "author": {
     "name": "Citrus-Lime Ltd",
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@citruslime/utils": "2.0.5-beta.0",
-    "@vueuse/core": "^12.0.0",
-    "vue": "^3.4.21"
+    "@vueuse/core": "^13.0.0",
+    "vue": "^3.5.13"
   },
   "scripts": {
     "build": "run-p build-source build-types",