@citruslime/vue-utils 1.4.3 → 1.4.4-beta.0

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@citruslime/vue-utils",
-    "version": "1.4.3",
+    "version": "1.4.4-beta.0",
     "type": "module",
     "author": {
         "name": "Citrus-Lime Ltd",
@@ -33,8 +33,8 @@
         "build-types": "vue-tsc --declaration --emitDeclarationOnly --declarationDir ./dist --project ./tsconfig.app.json --composite false"
     },
     "dependencies": {
-        "@citruslime/utils": "^1.3.0",
-        "@vueuse/core": "^10.2.1",
+        "@citruslime/utils": "^1.3.0-beta.0",
+        "@vueuse/core": "^10.4.1",
         "vue": "^3.2.47"
     }
 }