vue-api-kit 1.5.1 → 1.5.2

package/dist/index.js

@@ -1,40 +1,44 @@
 import { ZodError as L } from "zod";
-import * as T from "zod";
-import k, { AxiosError as S } from "axios";
+import * as U from "zod";
+import x, { AxiosError as S } from "axios";
 import { AxiosError as K } from "axios";
-import { nextTick as x, ref as m, onMounted as F, watch as N, onBeforeUnmount as Z } from "vue";
-import { debounce as _ } from "lodash-es";
-function z(r) {
-  const h = k.create({
-    baseURL: r.baseURL,
-    ...r.headers && { headers: r.headers },
-    withCredentials: r.withCredentials ?? !1
+import { nextTick as F, ref as m, onMounted as N, watch as T, onBeforeUnmount as Z } from "vue";
+import { debounce as $ } from "lodash-es";
+function z(s) {
+  const h = x.create({
+    baseURL: s.baseURL,
+    headers: {
+      "Content-Type": "application/json",
+      Accept: "application/json",
+      ...s.headers
+    },
+    withCredentials: s.withCredentials ?? !1
   });
-  let P = !1, q = null;
-  r.onBeforeRequest && h.interceptors.request.use(
+  let b = !1, q = null;
+  s.onBeforeRequest && h.interceptors.request.use(
     async (e) => {
       try {
-        return await r.onBeforeRequest(e) || e;
-      } catch (s) {
-        return Promise.reject(s);
+        return await s.onBeforeRequest(e) || e;
+      } catch (r) {
+        return Promise.reject(r);
       }
     },
     (e) => Promise.reject(e)
-  ), r.onStartRequest && h.interceptors.request.use(
+  ), s.onStartRequest && h.interceptors.request.use(
     async (e) => {
       try {
-        return await r.onStartRequest(), e;
-      } catch (s) {
-        return Promise.reject(s);
+        return await s.onStartRequest(), e;
+      } catch (r) {
+        return Promise.reject(r);
       }
     },
     (e) => Promise.reject(e)
-  ), r.onFinishRequest && h.interceptors.response.use(
-    (e) => (r.onFinishRequest(), e),
-    (e) => (r.onFinishRequest(), Promise.reject(e))
+  ), s.onFinishRequest && h.interceptors.response.use(
+    (e) => (s.onFinishRequest(), e),
+    (e) => (s.onFinishRequest(), Promise.reject(e))
   ), h.interceptors.request.use((e) => {
     if (!e.url) return e;
-    const s = (a) => {
+    const r = (a) => {
       if (a)
         for (const [t, v] of Object.entries(a)) {
           const l = `{${t}}`;
@@ -44,117 +48,114 @@ function z(r) {
           ), delete a[t]);
         }
     };
-    return e.method !== "get" && e.data?.params && s(e.data.params), s(e.params), e;
-  }), r.csrfRefreshEndpoint && h.interceptors.response.use(
+    return e.method !== "get" && e.data?.params && r(e.data.params), r(e.params), e;
+  }), s.csrfRefreshEndpoint && h.interceptors.response.use(
     (e) => e,
     async (e) => {
-      const s = e.config;
-      if (s.url === r.csrfRefreshEndpoint)
+      const r = e.config;
+      if (r?.url === s.csrfRefreshEndpoint)
         return Promise.reject(e);
-      if (e.response && (e.response.status === 403 || e.response.status === 419) && !s._retry) {
-        s._retry = !0;
+      if (e.response && (e.response.status === 403 || e.response.status === 419) && !r?._retry) {
+        r._retry = !0;
         try {
-          return P && q ? await q : (P = !0, q = h.get(r.csrfRefreshEndpoint, {
-            // Mark this request to prevent retry
-            _skipRetry: !0
-          }).then(() => {
-            P = !1, q = null;
-          }), await q), h(s);
+          return b && q ? await q : (b = !0, q = h.get(s.csrfRefreshEndpoint).then(() => {
+            b = !1, q = null;
+          }), await q), h.request(r);
         } catch (a) {
-          return P = !1, q = null, Promise.reject(a);
+          return b = !1, q = null, Promise.reject(a);
         }
       }
       return Promise.reject(e);
     }
   ), h.interceptors.response.use(
     (e) => e,
-    (e) => (x(() => {
+    (e) => (F(() => {
       e.code;
     }), Promise.reject(e))
   );
-  const C = r.queries ?? {}, M = {};
+  const C = s.queries ?? {}, M = {};
   for (const e in C) {
-    const s = C[e];
-    s && (M[e] = (a) => {
+    const r = C[e];
+    r && (M[e] = (a) => {
       let t;
       a && typeof a == "object" && ("loadOnMount" in a || "debounce" in a || "onResult" in a || "onError" in a || "data" in a ? t = a : t = { params: a });
-      const v = m(), l = m(), R = m(), g = m(!1), y = m(!1), A = m(!0);
-      let b = new AbortController();
+      const v = m(), l = m(), E = m(), g = m(!1), y = m(!1), P = m(!0);
+      let j = new AbortController();
       const u = () => {
-        b?.abort(), b = new AbortController();
+        j?.abort(), j = new AbortController();
       }, c = async () => {
         g.value && u(), g.value = !0, l.value = void 0;
         try {
-          s.params && t?.params && s.params.parse(t.params);
+          r.params && t?.params && r.params.parse(t.params);
           let o = t?.data;
-          s.data && o && s.data.parse(o);
+          r.data && o && r.data.parse(o);
           const f = {
-            method: s.method ?? "GET",
-            url: s.path,
+            method: r.method ?? "GET",
+            url: r.path,
             params: t?.params,
-            signal: b.signal
+            signal: j.signal
           };
-          s.method === "POST" && o && (f.data = o);
-          const n = await h.request(f), i = s.response ? s.response.parse(n.data) : n.data;
+          r.method === "POST" && o && (f.data = o);
+          const n = await h.request(f), i = r.response ? r.response.parse(n.data) : n.data;
           v.value = i, t?.onResult?.(i);
         } catch (o) {
           if (o instanceof S) {
             if (o.code !== "ERR_CANCELED") {
               const f = o.response?.data?.message || o.message || "An error occurred", n = o.response?.status, i = o.code, p = o.response?.data;
-              l.value = f, t?.onError?.(o), r.onErrorRequest?.({ message: f, status: n, code: i, data: p });
+              l.value = f, t?.onError?.(o), s.onErrorRequest?.({ message: f, status: n, code: i, data: p });
             }
           } else if (o instanceof L) {
-            R.value = o.issues || [];
-            const n = `Validation error: ${R.value.map(
+            E.value = o.issues || [];
+            const n = `Validation error: ${E.value.map(
               (i) => `${i.path.join(".")}: ${i.message}`
             ).join(", ")}`;
-            l.value = n, t?.onError?.(o), t?.onZodError?.(R.value), r.onErrorRequest?.({ message: n, code: "VALIDATION_ERROR" }), r.onZodError && r.onZodError(R.value);
+            l.value = n, t?.onError?.(o), t?.onZodError?.(E.value), s.onErrorRequest?.({ message: n, code: "VALIDATION_ERROR" }), s.onZodError && s.onZodError(E.value);
           } else {
             const f = o.message || "An error occurred";
-            l.value = f, t?.onError?.(f), r.onErrorRequest?.({ message: f });
+            l.value = f, t?.onError?.(f), s.onErrorRequest?.({ message: f });
           }
         } finally {
           g.value = !1, y.value = !0;
         }
-      }, E = t?.debounce ? _(c, t.debounce) : c;
+      }, R = t?.debounce ? $(c, t.debounce) : c;
       let d = null;
-      return (t?.params || t?.data) && (F(() => {
-        d && d(), d = N(
+      return (t?.params || t?.data) && (N(() => {
+        d && d(), d = T(
           () => JSON.stringify({ params: t.params, data: t.data }),
           () => {
-            E();
+            R();
           },
           { immediate: !1 }
         );
       }), Z(() => {
-        d && d(), b?.abort();
-      })), (t?.loadOnMount === void 0 || t.loadOnMount) && !y.value && (A.value ? (A.value = !1, c()) : E()), { result: v, errorMessage: l, zodErrors: R, isLoading: g, isDone: y, refetch: c };
+        d && d(), j?.abort();
+      })), (t?.loadOnMount === void 0 || t.loadOnMount) && !y.value && (P.value ? (P.value = !1, c()) : R()), { result: v, errorMessage: l, zodErrors: E, isLoading: g, isDone: y, refetch: c };
     });
   }
-  const D = r.mutations ?? {}, w = {};
+  const D = s.mutations ?? {}, w = {};
   for (const e in D) {
-    const s = D[e];
-    s && (w[e] = (a) => {
-      const t = m(), v = m(), l = m(), R = m(!1), g = m(!1), y = m(0);
-      return { result: t, errorMessage: v, zodErrors: l, isLoading: R, isDone: g, uploadProgress: y, mutate: async (b) => {
-        if (!R.value) {
-          R.value = !0, v.value = void 0, y.value = 0;
+    const r = D[e];
+    r && (w[e] = (a) => {
+      const t = m(), v = m(), l = m(), E = m(!1), g = m(!1), y = m(0);
+      return { result: t, errorMessage: v, zodErrors: l, isLoading: E, isDone: g, uploadProgress: y, mutate: async (j) => {
+        if (!E.value) {
+          E.value = !0, v.value = void 0, y.value = 0;
           try {
-            const { data: u = {}, params: c } = b ?? {};
-            let E = u ?? {}, d = {};
-            if (s.isMultipart) {
+            const { data: u = {}, params: c } = j ?? {};
+            let R = u ?? {}, d = {};
+            if (r.isMultipart) {
               const n = new FormData();
               for (const [i, p] of Object.entries(u))
-                p instanceof File || p instanceof Blob ? n.append(i, p) : Array.isArray(p) ? p.forEach((j) => {
-                  j instanceof File || j instanceof Blob ? n.append(i, j) : n.append(i, JSON.stringify(j));
+                p instanceof File || p instanceof Blob ? n.append(i, p) : Array.isArray(p) ? p.forEach((A) => {
+                  A instanceof File || A instanceof Blob ? n.append(i, A) : n.append(i, JSON.stringify(A));
                 }) : typeof p == "object" && p !== null ? n.append(i, JSON.stringify(p)) : n.append(i, String(p));
-              E = n, d["Content-Type"] = "multipart/form-data";
-            } else s.data && s.data.parse(u);
-            s.params && c && s.params.parse(c);
+              R = n, d["Content-Type"] = "multipart/form-data";
+            } else r.data && r.data.parse(u);
+            r.params && c && r.params.parse(c);
             const o = await h.request({
-              method: s.method,
-              url: s.path,
-              data: E,
+              method: r.method,
+              url: r.path,
+              data: R,
               params: c,
               headers: d,
               onUploadProgress: (n) => {
@@ -163,24 +164,24 @@ function z(r) {
                   y.value = i, a?.onUploadProgress?.(i);
                 }
               }
-            }), f = s.response ? s.response.parse(o.data) : o.data;
+            }), f = r.response ? r.response.parse(o.data) : o.data;
             t.value = f, a?.onResult?.(f);
           } catch (u) {
             if (u instanceof S) {
-              const c = u.response?.data?.message || u.message || "An error occurred", E = u.response?.status, d = u.code;
-              v.value = c, a?.onError?.(u), r.onErrorRequest?.({ message: c, status: E, code: d });
+              const c = u.response?.data?.message || u.message || "An error occurred", R = u.response?.status, d = u.code;
+              v.value = c, a?.onError?.(u), s.onErrorRequest?.({ message: c, status: R, code: d });
             } else if (u instanceof L) {
               l.value = u.issues || [];
-              const E = `Validation error: ${l.value.map(
+              const R = `Validation error: ${l.value.map(
                 (d) => `${d.path.join(".")}: ${d.message}`
               ).join(", ")}`;
-              v.value = E, a?.onError?.(u), a?.onZodError?.(l.value), r.onErrorRequest?.({ message: E, code: "VALIDATION_ERROR" }), r.onZodError && r.onZodError(l.value);
+              v.value = R, a?.onError?.(u), a?.onZodError?.(l.value), s.onErrorRequest?.({ message: R, code: "VALIDATION_ERROR" }), s.onZodError && s.onZodError(l.value);
             } else {
               const c = u.message || "An error occurred";
-              v.value = c, a?.onError?.(u), r.onErrorRequest?.({ message: c });
+              v.value = c, a?.onError?.(u), s.onErrorRequest?.({ message: c });
             }
           } finally {
-            R.value = !1, g.value = !0;
+            E.value = !1, g.value = !0;
           }
         }
       } };
@@ -191,17 +192,17 @@ function z(r) {
     mutation: w
   };
 }
-function V(r) {
-  return r;
+function V(s) {
+  return s;
 }
-function J(r) {
-  return r;
+function J(s) {
+  return s;
 }
-function Q(...r) {
-  return Object.assign({}, ...r);
+function Q(...s) {
+  return Object.assign({}, ...s);
 }
-function W(...r) {
-  return Object.assign({}, ...r);
+function W(...s) {
+  return Object.assign({}, ...s);
 }
 export {
   K as AxiosError,
@@ -210,5 +211,5 @@ export {
   V as defineQuery,
   W as mergeMutations,
   Q as mergeQueries,
-  T as z
+  U as z
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vue-api-kit",
   "type": "module",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "A powerful and flexible API client for Vue 3 applications, built with TypeScript and Zod for type-safe API interactions.",
   "keywords": [
     "vue3",