@citruslime/vue-utils 2.0.4-beta.1 → 2.0.4-beta.2

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citruslime/vue-utils",
-  "version": "2.0.4-beta.1",
+  "version": "2.0.4-beta.2",
   "type": "module",
   "author": {
     "name": "Citrus-Lime Ltd",
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@citruslime/utils": "2.0.7-beta.2",
-    "@vueuse/core": "^13.0.0",
-    "vue": "^3.5.13"
+    "@vueuse/core": "^13.7.0",
+    "vue": "^3.5.19"
   },
   "scripts": {
     "build": "run-p build-source build-types",