@citruslime/vue-utils 1.4.3-beta.1 → 1.4.3

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

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

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

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

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

@@ -6,10 +6,11 @@ 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/').
  * @returns An API object containing request methods.
  */
 export declare function useApi<TEndpoint extends Record<keyof TEndpoint, Endpoint>>(endpoints: TEndpoint, handleFetchErrorResponse: (context: {
     data: any;
     response: Response | null;
     error: any;
-}) => void): Record<keyof TEndpoint, <TResponseModel>(...values: unknown[]) => ApiRequest<TResponseModel>>;
+}) => void, prefix?: string): Record<keyof TEndpoint, <TResponseModel>(...values: unknown[]) => ApiRequest<TResponseModel>>;

package/package.json

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