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

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

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

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

@@ -4,6 +4,7 @@ export interface Endpoint {
     type: typeof requestTypes[number];
     headers: () => HeadersInit;
     hasBody: boolean;
+    options: RequestInit;
 }
 /**
  * Creates an endpoint object, using the provided values.
@@ -12,9 +13,10 @@ export interface Endpoint {
  * @param type The type of HTTP request to make.
  * @param headers The headers this request will use.
  * @param hasBody Determines whether or not an endpoint should have a body.
+ * @param options The options to pass to the useFetch composable.
  * @returns The created Endpoint object.
  */
-export declare function createEndpoint(url: string, type: typeof requestTypes[number], headers?: (() => HeadersInit) | null, hasBody?: boolean | null): Endpoint;
+export declare function createEndpoint(url: string, type: typeof requestTypes[number], headers?: (() => HeadersInit) | null, hasBody?: boolean | null, options?: RequestInit | null): Endpoint;
 /**
  * Gets a set of default headers.
  *

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

@@ -7,10 +7,14 @@ export type ApiRequest<TResponseModel> = ReturnType<typeof useFetch<TResponseMod
  * @param endpoints The endpoints provided to build with the factory.
  * @param handleFetchErrorResponse The error handler for the api factory.
  * @param prefix The prefix to append to the url (defaults to '/api/').
+ * @param handleAfterFetchResponse The optional after fetch response handler for the api factory.
  * @returns An API object containing request methods.
  */
 export declare function useApi<TEndpoint extends Record<keyof TEndpoint, Endpoint>>(endpoints: TEndpoint, handleFetchErrorResponse: (context: {
     data: unknown;
     response: Response | null;
     error: unknown;
-}) => void, prefix?: string): Record<keyof TEndpoint, <TResponseModel>(...values: unknown[]) => ApiRequest<TResponseModel>>;
+}) => void, prefix?: string, handleAfterFetchResponse?: (context: {
+    data: unknown;
+    response: Response;
+}, endPoint: Endpoint) => void): Record<keyof TEndpoint, <TResponseModel>(...values: unknown[]) => ApiRequest<TResponseModel>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citruslime/vue-utils",
-  "version": "2.0.4-beta.1",
+  "version": "2.0.4-beta.3",
   "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",