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

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

@@ -1,17 +1,18 @@
 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";
+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 De(e, t, i = null, u = null) {
+function De(e, t, a = null, c = null, h = null) {
   return {
     url: e,
     type: t,
-    headers: i ?? oe,
-    hasBody: pe(t, u)
+    headers: a ?? oe,
+    hasBody: pe(t, c),
+    options: h ?? {}
   };
 }
 function oe() {
@@ -28,25 +29,25 @@ function re(e) {
 }
 // @__NO_SIDE_EFFECTS__
 function I() {
-  const e = /* @__PURE__ */ new Set(), t = (a) => {
-    e.delete(a);
+  const e = /* @__PURE__ */ new Set(), t = (l) => {
+    e.delete(l);
   };
   return {
-    on: (a) => {
-      e.add(a);
-      const n = () => t(a);
+    on: (l) => {
+      e.add(l);
+      const n = () => t(l);
       return re(n), {
         off: n
       };
     },
     off: t,
-    trigger: (...a) => Promise.all(Array.from(e).map((n) => n(...a))),
+    trigger: (...l) => Promise.all(Array.from(e).map((n) => n(...l))),
     clear: () => {
       e.clear();
     }
   };
 }
-const ae = typeof window < "u" && typeof document < "u";
+const ie = typeof window < "u" && typeof document < "u";
 typeof WorkerGlobalScope < "u" && globalThis instanceof WorkerGlobalScope;
 const he = () => {
 };
@@ -54,145 +55,145 @@ function L(...e) {
   if (e.length !== 1)
     return le(...e);
   const t = e[0];
-  return typeof t == "function" ? V(ue(() => ({ get: t, set: he }))) : se(t);
+  return typeof t == "function" ? z(ue(() => ({ get: t, set: he }))) : se(t);
 }
-function ee(e, t = !1, i = "Timeout") {
-  return new Promise((u, v) => {
-    setTimeout(t ? () => v(i) : u, e);
+function ee(e, t = !1, a = "Timeout") {
+  return new Promise((c, h) => {
+    setTimeout(t ? () => h(a) : c, e);
   });
 }
 function ye(e, ...t) {
-  return t.some((i) => i in e);
+  return t.some((a) => a in e);
 }
-function z(e, t = !1) {
-  function i(o, { flush: d = "sync", deep: l = !1, timeout: m, throwOnTimeout: g } = {}) {
-    let p = null;
+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) => {
-      p = _(
+      y = _(
         e,
-        (T) => {
-          o(T) !== t && (p ? p() : Z(() => p?.()), w(T));
+        (v) => {
+          o(v) !== t && (y ? y() : Z(() => y?.()), w(v));
         },
         {
-          flush: d,
-          deep: l,
+          flush: u,
+          deep: m,
           immediate: !0
         }
       );
     })];
-    return m != null && P.push(
-      ee(m, g).then(() => E(e)).finally(() => p?.())
+    return i != null && P.push(
+      ee(i, b).then(() => E(e)).finally(() => y?.())
     ), Promise.race(P);
   }
-  function u(o, d) {
+  function c(o, u) {
     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 = _(
+      return a((v) => v === o, u);
+    const { flush: m = "sync", deep: i = !1, timeout: b, throwOnTimeout: y } = u ?? {};
+    let T = null;
+    const w = [new Promise((v) => {
+      T = _(
         [e, o],
         ([J, D]) => {
-          t !== (J === D) && (y ? y() : Z(() => y?.()), T(J));
+          t !== (J === D) && (T ? T() : Z(() => T?.()), v(J));
         },
         {
-          flush: l,
-          deep: m,
+          flush: m,
+          deep: i,
           immediate: !0
         }
       );
     })];
-    return g != null && w.push(
-      ee(g, p).then(() => E(e)).finally(() => (y?.(), E(e)))
+    return b != null && w.push(
+      ee(b, y).then(() => E(e)).finally(() => (T?.(), E(e)))
     ), Promise.race(w);
   }
-  function v(o) {
-    return i((d) => !!d, o);
+  function h(o) {
+    return a((u) => !!u, o);
   }
-  function a(o) {
-    return u(null, o);
+  function l(o) {
+    return c(null, o);
   }
   function n(o) {
-    return u(void 0, o);
+    return c(void 0, o);
   }
   function r(o) {
-    return i(Number.isNaN, o);
+    return a(Number.isNaN, o);
   }
-  function F(o, d) {
-    return i((l) => {
-      const m = Array.from(l);
-      return m.includes(o) || m.includes(E(o));
-    }, d);
+  function p(o, u) {
+    return a((m) => {
+      const i = Array.from(m);
+      return i.includes(o) || i.includes(E(o));
+    }, u);
   }
-  function s(o) {
-    return h(1, o);
+  function g(o) {
+    return s(1, o);
   }
-  function h(o = 1, d) {
-    let l = -1;
-    return i(() => (l += 1, l >= o), d);
+  function s(o = 1, u) {
+    let m = -1;
+    return a(() => (m += 1, m >= o), u);
   }
   return Array.isArray(E(e)) ? {
-    toMatch: i,
-    toContains: F,
-    changed: s,
-    changedTimes: h,
+    toMatch: a,
+    toContains: p,
+    changed: g,
+    changedTimes: s,
     get not() {
-      return z(e, !t);
+      return Q(e, !t);
     }
   } : {
-    toMatch: i,
-    toBe: u,
-    toBeTruthy: v,
-    toBeNull: a,
+    toMatch: a,
+    toBe: c,
+    toBeTruthy: h,
+    toBeNull: l,
     toBeNaN: r,
     toBeUndefined: n,
-    changed: s,
-    changedTimes: h,
+    changed: g,
+    changedTimes: s,
     get not() {
-      return z(e, !t);
+      return Q(e, !t);
     }
   };
 }
 function me(e) {
-  return z(e);
+  return Q(e);
 }
-function Te(e, t, i = {}) {
+function Te(e, t, a = {}) {
   const {
-    immediate: u = !0,
-    immediateCallback: v = !1
-  } = i, a = O(!1);
+    immediate: c = !0,
+    immediateCallback: h = !1
+  } = a, l = O(!1);
   let n;
   function r() {
     n && (clearTimeout(n), n = void 0);
   }
-  function F() {
-    a.value = !1, r();
+  function p() {
+    l.value = !1, r();
   }
-  function s(...h) {
-    v && e(), r(), a.value = !0, n = setTimeout(() => {
-      a.value = !1, n = void 0, e(...h);
+  function g(...s) {
+    h && e(), r(), l.value = !0, n = setTimeout(() => {
+      l.value = !1, n = void 0, e(...s);
     }, E(t));
   }
-  return u && (a.value = !0, ae && s()), re(F), {
-    isPending: ie(a),
-    start: s,
-    stop: F
+  return c && (l.value = !0, ie && g()), re(p), {
+    isPending: ae(l),
+    start: g,
+    stop: p
   };
 }
-const ve = ae ? window : void 0, ge = {
+const ve = ie ? window : void 0, ge = {
   json: "application/json",
   text: "text/plain"
 };
 function te(e) {
   return e && ye(e, "immediate", "refetch", "initialData", "timeout", "beforeFetch", "afterFetch", "onFetchError", "fetch", "updateDataOnError");
 }
-function R(e) {
+function V(e) {
   return typeof Headers < "u" && e instanceof Headers ? Object.fromEntries(e.entries()) : e;
 }
 function be(e, ...t) {
-  var i, u;
-  const v = typeof AbortController == "function";
-  let a = {}, n = {
+  var a, c;
+  const h = typeof AbortController == "function";
+  let l = {}, n = {
     immediate: !0,
     refetch: !1,
     timeout: 0,
@@ -203,104 +204,104 @@ function be(e, ...t) {
     type: "text",
     payload: void 0
   };
-  t.length > 0 && (te(t[0]) ? n = { ...n, ...t[0] } : a = t[0]), t.length > 1 && te(t[1]) && (n = { ...n, ...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: 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);
+    fetch: p = (c = (a = ve) == null ? void 0 : a.fetch) != null ? c : globalThis?.fetch,
+    initialData: g,
+    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 = (c) => {
-    v && (D?.abort(c), D = new AbortController(), D.signal.onabort = () => p.value = !0, a = {
-      ...a,
+  const M = (f) => {
+    h && (D?.abort(f), D = new AbortController(), D.signal.onabort = () => y.value = !0, l = {
+      ...l,
       signal: D.signal
     });
-  }, $ = (c) => {
-    g.value = c, m.value = !c;
+  }, $ = (f) => {
+    b.value = f, i.value = !f;
   };
-  h && (N = Te(M, h, { immediate: !1 }));
+  s && (N = Te(M, s, { immediate: !1 }));
   let K = 0;
-  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 = {
+  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: r.method,
       headers: {}
     }, 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;
+      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 X = !1;
-    const S = {
+    const A = {
       url: E(e),
       options: {
-        ...A,
-        ...a
+        ...S,
+        ...l
       },
       cancel: () => {
         X = !0;
       }
     };
-    if (n.beforeFetch && Object.assign(S, await n.beforeFetch(S)), X || !F)
+    if (n.beforeFetch && Object.assign(A, await n.beforeFetch(A)), X || !p)
       return $(!1), Promise.resolve(null);
     let C = null;
-    return N && N.start(), F(
-      S.url,
+    return N && N.start(), p(
+      A.url,
       {
-        ...A,
-        ...S.options,
+        ...S,
+        ...A.options,
         headers: {
-          ...R(A.headers),
-          ...R((x = S.options) == null ? void 0 : x.headers)
+          ...V(S.headers),
+          ...V((x = A.options) == null ? void 0 : x.headers)
         }
       }
-    ).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);
+    ).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: f,
-        context: S,
+        response: d,
+        context: A,
         execute: B
-      })), T.value = C, o.trigger(f), f;
-    }).catch(async (f) => {
-      let G = f.message || f.name;
+      })), 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: f,
+        error: d,
         response: P.value,
-        context: S,
+        context: A,
         execute: B
-      })), w.value = G, n.updateDataOnError && (T.value = C), d.trigger(f), c)
-        throw f;
+      })), w.value = G, n.updateDataOnError && (v.value = C), u.trigger(d), f)
+        throw d;
       return null;
     }).finally(() => {
-      U === K && $(!1), N && N.stop(), l.trigger(null);
+      U === K && $(!1), N && N.stop(), m.trigger(null);
     });
-  }, Q = L(n.refetch);
+  }, R = L(n.refetch);
   _(
     [
-      Q,
+      R,
       L(e)
     ],
-    ([c]) => c && B(),
+    ([f]) => f && B(),
     { deep: !0 }
   );
   const W = {
-    isFinished: V(m),
-    isFetching: V(g),
-    statusCode: y,
+    isFinished: z(i),
+    isFetching: z(b),
+    statusCode: T,
     response: P,
     error: w,
-    data: T,
+    data: v,
     canAbort: J,
-    aborted: p,
+    aborted: y,
     abort: M,
     execute: B,
     onFetchResponse: o.on,
-    onFetchError: d.on,
-    onFetchFinally: l.on,
+    onFetchError: u.on,
+    onFetchFinally: m.on,
     // method
     get: j("GET"),
     put: j("PUT"),
@@ -316,84 +317,88 @@ function be(e, ...t) {
     arrayBuffer: k("arrayBuffer"),
     formData: k("formData")
   };
-  function j(c) {
-    return (b, x) => {
-      if (!g.value)
-        return r.method = c, r.payload = b, r.payloadType = x, ne(r.payload) && _(
+  function j(f) {
+    return (F, x) => {
+      if (!b.value)
+        return r.method = f, r.payload = F, r.payloadType = x, ne(r.payload) && _(
           [
-            Q,
+            R,
             L(r.payload)
           ],
           ([U]) => U && B(),
           { deep: !0 }
         ), {
           ...W,
-          then(U, A) {
-            return q().then(U, A);
+          then(U, S) {
+            return q().then(U, S);
           }
         };
     };
   }
   function q() {
-    return new Promise((c, b) => {
-      me(m).toBe(!0).then(() => c(W)).catch(b);
+    return new Promise((f, F) => {
+      me(i).toBe(!0).then(() => f(W)).catch(F);
     });
   }
-  function k(c) {
+  function k(f) {
     return () => {
-      if (!g.value)
-        return r.type = c, {
+      if (!b.value)
+        return r.type = f, {
           ...W,
-          then(b, x) {
-            return q().then(b, x);
+          then(F, x) {
+            return q().then(F, x);
           }
         };
     };
   }
   return n.immediate && Promise.resolve().then(() => B()), {
     ...W,
-    then(c, b) {
-      return q().then(c, b);
+    then(f, F) {
+      return q().then(f, F);
     }
   };
 }
-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 = {
+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(),
-        ...r.headers()
+        ...p.headers()
       };
-      Fe(h);
-      const o = be(
+      Fe(o);
+      const u = be(
         s,
         {
-          method: F
+          ...p.options,
+          method: g
         },
         {
           immediate: !1,
-          beforeFetch({ options: l }) {
-            return l.headers = {
-              ...l.headers,
-              ...h
-            }, r.hasBody && n.length && (l.body = JSON.stringify(n[0])), {
-              options: l
+          beforeFetch({ options: i }) {
+            return i.headers = {
+              ...i.headers,
+              ...o
+            }, p.hasBody && r.length && (i.body = JSON.stringify(r[0])), {
+              options: i
             };
           },
-          onFetchError(l) {
-            return l?.response && t(l), l;
+          onFetchError(i) {
+            return i?.response && t(i), i;
+          },
+          afterFetch(i) {
+            return c && c(i, p), i;
           }
         }
       );
       return {
-        ...we(h) === "application/json" ? o.json() : o.text()
+        ...we(o) === "application/json" ? u.json() : u.text()
       };
     };
-  }), u;
+  }), h;
 }
 function Fe(e) {
   e["content-type"] === "multipart/form-data" && delete e["content-type"];
@@ -401,11 +406,11 @@ function Fe(e) {
 function we(e) {
   return e.accept ?? "*/*";
 }
-function Ae(e) {
+function Se(e) {
   return JSON.parse(JSON.stringify(e));
 }
 export {
-  Ae as copy,
+  Se as copy,
   De as createEndpoint,
   oe as getDefaultHeaders,
   Pe as requestTypes,

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

@@ -1 +1 @@
-(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"})}));
+(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.2",
+  "version": "2.0.4-beta.3",
   "type": "module",
   "author": {
     "name": "Citrus-Lime Ltd",