@citruslime/vue-utils 2.0.1 → 2.0.2-beta.0

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citruslime/vue-utils",
-  "version": "2.0.1",
+  "version": "2.0.2-beta.0",
   "type": "module",
   "author": {
     "name": "Citrus-Lime Ltd",
@@ -28,8 +28,8 @@
     }
   },
   "dependencies": {
-    "@citruslime/utils": "~2.0.4",
-    "@vueuse/core": "^10.9.0",
+    "@citruslime/utils": "2.0.4-beta.1",
+    "@vueuse/core": "^12.0.0",
     "vue": "^3.4.21"
   },
   "scripts": {