@citruslime/vue-utils 1.4.5 → 2.0.0-beta.0

package/README.md

@@ -1,6 +1,6 @@
 # Citrus-Lime Vue Utils
 
-A TypeScript package containing various utilities for Vue-based projects. Used by [Citrus-Lime UI](https://www.npmjs.com/package/@citruslime/ui).
+A package containing various utilities for Vue-based projects. Used by [Citrus-Lime UI](https://www.npmjs.com/package/@citruslime/ui).
 
 ![version](https://img.shields.io/npm/v/@citruslime/vue-utils/latest)
 ![version next](https://img.shields.io/npm/v/@citruslime/vue-utils/next)
@@ -11,7 +11,7 @@ A TypeScript package containing various utilities for Vue-based projects. Used b
 
 ## Install
 
-`npm install @citruslime/vue-utils vue`
+`pnpm add @citruslime/vue-utils vue`
 
 or
 
@@ -19,4 +19,4 @@ or
 
 or
 
-`pnpm add @citruslime/vue-utils vue`
+`npm install @citruslime/vue-utils vue`

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@citruslime/vue-utils",
-    "version": "1.4.5",
+    "version": "2.0.0-beta.0",
     "type": "module",
     "author": {
         "name": "Citrus-Lime Ltd",
@@ -30,11 +30,12 @@
     "scripts": {
         "build": "run-p build-source build-types",
         "build-source": "vite build",
-        "build-types": "vue-tsc --declaration --emitDeclarationOnly --declarationDir ./dist --project ./tsconfig.app.json --composite false"
+        "build-types": "vue-tsc --declaration --emitDeclarationOnly --declarationDir ./dist --project ./tsconfig.app.json --composite false",
+        "lint": "eslint . --fix"
     },
     "dependencies": {
-        "@citruslime/utils": "^1.3.1",
-        "@vueuse/core": "^10.4.1",
-        "vue": "^3.2.47"
+        "@citruslime/utils": "2.0.0-beta.0",
+        "@vueuse/core": "^10.9.0",
+        "vue": "^3.4.21"
     }
 }