vue-api-kit 1.10.5 → 1.10.7

package/dist/core/types.d.ts

@@ -129,13 +129,9 @@ export interface ApiClientOptions<Q extends Record<string, NestedStructure<ApiQu
     onBeforeRequest?: (config: InternalAxiosRequestConfig<any>) => Promise<any> | void | any;
     onStartRequest?: () => Promise<void> | void | any;
     onFinishRequest?: () => Promise<void> | void | any;
-    onErrorRequest?: (error: {
+    onError?: (error: {
         err: AxiosError | ZodError | Error;
         message: string;
-        status?: number;
-        code?: string;
-        response?: any;
-        url?: string;
     }) => void;
     onZodError?: (zodError: $ZodFlattenedError<any, any>) => void;
 }

package/dist/index.d.ts

@@ -2,5 +2,5 @@ export * as z from 'zod';
 export { createApiClient } from './core/client';
 export { mergeQueries, mergeMutations, defineQuery, defineMutation } from './core/merge';
 export type * from './core/types';
-export type { ZodError } from 'zod';
+export { ZodError } from 'zod';
 export { AxiosError } from 'axios';

package/dist/index.js

@@ -1,17 +1,18 @@
-import P, { ZodError as F } from "zod";
-import * as W from "zod";
-import N, { AxiosError as L } from "axios";
-import { AxiosError as ae } from "axios";
-import { nextTick as $, ref as v, onMounted as U, watch as I, onBeforeUnmount as Q } from "vue";
-import { debounce as z } from "lodash-es";
-function J(e) {
+import A, { ZodError as F } from "zod";
+import * as G from "zod";
+import { ZodError as ae } from "zod";
+import U, { AxiosError as Z } from "axios";
+import { AxiosError as ie } from "axios";
+import { nextTick as _, ref as p, onMounted as N, watch as Q, onBeforeUnmount as z } from "vue";
+import { debounce as J } from "lodash-es";
+function H(e) {
   return e && typeof e == "object" && e !== null && typeof e.path == "string";
 }
-function H(e) {
+function W(e) {
   return e && typeof e == "object" && e !== null && typeof e.path == "string" && typeof e.method == "string";
 }
 function Y(e) {
-  const h = N.create({
+  const h = U.create({
     baseURL: e.baseURL,
     headers: {
       "Content-Type": "application/json",
@@ -21,13 +22,13 @@ function Y(e) {
     withCredentials: e.withCredentials ?? !1,
     withXSRFToken: e.withXSRFToken ?? !1
   });
-  let B = !1, A = null;
+  let B = !1, w = null;
   e.onBeforeRequest && h.interceptors.request.use(
     async (r) => {
       try {
         return await e.onBeforeRequest(r) || r;
-      } catch (i) {
-        return Promise.reject(i);
+      } catch (n) {
+        return Promise.reject(n);
       }
     },
     (r) => Promise.reject(r)
@@ -35,8 +36,8 @@ function Y(e) {
     async (r) => {
       try {
         return await e.onStartRequest(), r;
-      } catch (i) {
-        return Promise.reject(i);
+      } catch (n) {
+        return Promise.reject(n);
       }
     },
     (r) => Promise.reject(r)
@@ -45,188 +46,188 @@ function Y(e) {
     (r) => (e.onFinishRequest(), Promise.reject(r))
   ), h.interceptors.request.use((r) => {
     if (!r.url) return r;
-    const i = (m) => {
+    const n = (m) => {
       if (m)
-        for (const [d, s] of Object.entries(m)) {
-          const o = `{${d}}`;
+        for (const [c, s] of Object.entries(m)) {
+          const o = `{${c}}`;
           r.url.includes(o) && (r.url = r.url.replace(
             o,
             encodeURIComponent(String(s))
-          ), delete m[d]);
+          ), delete m[c]);
         }
     };
-    return r.method !== "get" && r.data?.params && i(r.data.params), i(r.params), r;
+    return r.method !== "get" && r.data?.params && n(r.data.params), n(r.params), r;
   }), e.csrfRefreshEndpoint && h.interceptors.response.use(
     (r) => r,
     async (r) => {
-      const i = r.config;
-      if (i?.url === e.csrfRefreshEndpoint)
+      const n = r.config;
+      if (n?.url === e.csrfRefreshEndpoint)
         return Promise.reject(r);
-      if (r.response && (r.response.status === 403 || r.response.status === 419) && !i?._retry) {
-        i._retry = !0;
+      if (r.response && (r.response.status === 403 || r.response.status === 419) && !n?._retry) {
+        n._retry = !0;
         try {
-          return B && A ? await A : (B = !0, A = h.get(e.csrfRefreshEndpoint).then(() => {
-            B = !1, A = null;
-          }), await A), h.request(i);
+          return B && w ? await w : (B = !0, w = h.get(e.csrfRefreshEndpoint).then(() => {
+            B = !1, w = null;
+          }), await w), h.request(n);
         } catch (m) {
-          return B = !1, A = null, Promise.reject(m);
+          return B = !1, w = null, Promise.reject(m);
         }
       }
       return Promise.reject(r);
     }
   ), h.interceptors.response.use(
     (r) => r,
-    (r) => ($(() => {
+    (r) => (_(() => {
       r.code;
     }), Promise.reject(r))
   );
   function D(r) {
-    const i = {};
+    const n = {};
     for (const m in r) {
-      const d = r[m];
-      if (d)
-        if (J(d)) {
-          const s = d;
-          i[m] = (o) => {
+      const c = r[m];
+      if (c)
+        if (H(c)) {
+          const s = c;
+          n[m] = (o) => {
             let a;
             o && typeof o == "object" && ("loadOnMount" in o || "debounce" in o || "onResult" in o || "onError" in o || "onZodError" in o || "onBeforeRequest" in o || "params" in o || "data" in o ? a = o : a = { params: o });
-            const b = v(), p = v(), g = v(), C = v(!1), j = v(!1), k = v(!0);
-            let w = new AbortController();
-            const n = () => {
-              w?.abort(), w = new AbortController();
+            const g = p(), v = p(), E = p(), C = p(!1), j = p(!1), k = p(!0);
+            let P = new AbortController();
+            const i = () => {
+              P?.abort(), P = new AbortController();
             }, l = async () => {
-              C.value && n(), C.value = !0, p.value = void 0;
+              C.value && i(), C.value = !0, v.value = void 0;
               try {
                 s.params && a?.params && s.params.parse(a.params);
                 let t = a?.data;
                 s.data && t && s.data.parse(t);
-                const c = {
+                const u = {
                   method: s.method ?? "GET",
                   url: s.path,
                   params: a?.params,
-                  signal: w.signal
+                  signal: P.signal
                 };
-                if (s.method === "POST" && t && (c.data = t), s.onBeforeRequest) {
-                  const f = await s.onBeforeRequest(c);
-                  f !== void 0 && Object.assign(c, f);
+                if (s.method === "POST" && t && (u.data = t), s.onBeforeRequest) {
+                  const d = await s.onBeforeRequest(u);
+                  d !== void 0 && Object.assign(u, d);
                 }
                 if (a?.onBeforeRequest) {
-                  const f = await a.onBeforeRequest(c);
-                  f !== void 0 && Object.assign(c, f);
+                  const d = await a.onBeforeRequest(u);
+                  d !== void 0 && Object.assign(u, d);
                 }
-                p.value = void 0, g.value = void 0;
-                const E = await h.request(c), u = s.response ? s.response.parse(E.data) : E.data;
-                b.value = u, a?.onResult?.(u);
+                v.value = void 0, E.value = void 0;
+                const b = await h.request(u), f = s.response ? s.response.parse(b.data) : b.data;
+                g.value = f, a?.onResult?.(f);
               } catch (t) {
-                if (t instanceof L) {
+                if (t instanceof Z) {
                   if (t.code !== "ERR_CANCELED") {
-                    const c = t.config?.url, E = t.response?.data?.message || t.message || "An error occurred", u = t.response?.status, f = t.code, R = t.response;
-                    p.value = E, a?.onError?.(t), e.onErrorRequest?.({ err: t, message: E, status: u, code: f, response: R, url: c });
+                    const u = t.response?.data?.message || t.message || "An error occurred";
+                    v.value = u, a?.onError?.(t), e.onError?.({ err: t, message: u });
                   }
                 } else if (t instanceof F) {
-                  g.value = P.flattenError(t);
-                  const c = Object.keys(g.value.fieldErrors).length, E = `${Object.values(g.value.fieldErrors).at(0)}.${c > 1 ? ` (and ${c - 1} more errors)` : ""}`;
-                  p.value = E, a?.onError?.(t), a?.onZodError?.(P.flattenError(t)), e.onErrorRequest?.({ err: t, message: E, code: "VALIDATION_ERROR" }), e.onZodError && e.onZodError(P.flattenError(t));
+                  E.value = A.flattenError(t);
+                  const u = Object.keys(E.value.fieldErrors).length, b = `${Object.values(E.value.fieldErrors).at(0)}.${u > 1 ? ` (and ${u - 1} more errors)` : ""}`;
+                  v.value = b, a?.onError?.(t), a?.onZodError?.(A.flattenError(t)), e.onError?.({ err: t, message: b }), e.onZodError && e.onZodError(A.flattenError(t));
                 } else {
-                  const c = t.message || "An error occurred";
-                  p.value = c, a?.onError?.(c), e.onErrorRequest?.({ err: t, message: c });
+                  const u = t.message || "An error occurred";
+                  v.value = u, a?.onError?.(u), e.onError?.({ err: t, message: u });
                 }
               } finally {
                 C.value = !1, j.value = !0;
               }
-            }, y = a?.debounce ? z(l, a.debounce) : l;
+            }, R = a?.debounce ? J(l, a.debounce) : l;
             let q = null;
-            return (a?.params || a?.data) && (U(() => {
-              q && q(), q = I(
+            return (a?.params || a?.data) && (N(() => {
+              q && q(), q = Q(
                 () => JSON.stringify({ params: a.params, data: a.data }),
                 () => {
-                  y();
+                  R();
                 },
                 { immediate: !1 }
               );
-            }), Q(() => {
-              q && q(), w?.abort();
-            })), (a?.loadOnMount === void 0 || a.loadOnMount) && !j.value && (k.value ? (k.value = !1, l()) : y()), { result: b, errorMessage: p, zodError: g, isLoading: C, isDone: j, refetch: l };
+            }), z(() => {
+              q && q(), P?.abort();
+            })), (a?.loadOnMount === void 0 || a.loadOnMount) && !j.value && (k.value ? (k.value = !1, l()) : R()), { result: g, errorMessage: v, zodError: E, isLoading: C, isDone: j, refetch: l };
           };
-        } else typeof d == "object" && (i[m] = D(d));
+        } else typeof c == "object" && (n[m] = D(c));
     }
-    return i;
+    return n;
   }
-  const T = e.queries ?? {}, Z = D(T);
+  const x = e.queries ?? {}, L = D(x);
   function S(r) {
-    const i = {};
+    const n = {};
     for (const m in r) {
-      const d = r[m];
-      if (d)
-        if (H(d)) {
-          const s = d;
-          i[m] = (o) => {
-            const a = v(), b = v(), p = v(), g = v(!1), C = v(!1), j = v(0);
-            return { result: a, errorMessage: b, zodError: p, isLoading: g, isDone: C, uploadProgress: j, mutate: async (w) => {
-              if (!g.value) {
-                g.value = !0, b.value = void 0, j.value = 0;
+      const c = r[m];
+      if (c)
+        if (W(c)) {
+          const s = c;
+          n[m] = (o) => {
+            const a = p(), g = p(), v = p(), E = p(!1), C = p(!1), j = p(0);
+            return { result: a, errorMessage: g, zodError: v, isLoading: E, isDone: C, uploadProgress: j, mutate: async (P) => {
+              if (!E.value) {
+                E.value = !0, g.value = void 0, j.value = 0;
                 try {
-                  const { data: n = {}, params: l } = w ?? {};
-                  let y = n ?? {}, q = {};
+                  const { data: i = {}, params: l } = P ?? {};
+                  let R = i ?? {}, q = {};
                   if (s.isMultipart) {
-                    const u = new FormData();
-                    for (const [f, R] of Object.entries(n))
-                      R instanceof File || R instanceof Blob ? u.append(f, R) : Array.isArray(R) ? R.forEach((M) => {
-                        M instanceof File || M instanceof Blob ? u.append(f, M) : u.append(f, JSON.stringify(M));
-                      }) : typeof R == "object" && R !== null ? u.append(f, JSON.stringify(R)) : u.append(f, String(R));
-                    y = u, q["Content-Type"] = "multipart/form-data";
-                  } else s.data && s.data.parse(n);
+                    const f = new FormData();
+                    for (const [d, y] of Object.entries(i))
+                      y instanceof File || y instanceof Blob ? f.append(d, y) : Array.isArray(y) ? y.forEach((M) => {
+                        M instanceof File || M instanceof Blob ? f.append(d, M) : f.append(d, JSON.stringify(M));
+                      }) : typeof y == "object" && y !== null ? f.append(d, JSON.stringify(y)) : f.append(d, String(y));
+                    R = f, q["Content-Type"] = "multipart/form-data";
+                  } else s.data && s.data.parse(i);
                   s.params && l && s.params.parse(l);
                   const t = {
                     method: s.method,
                     url: s.path,
-                    data: y,
+                    data: R,
                     params: l,
                     headers: q,
-                    onUploadProgress: (u) => {
-                      if (u.total) {
-                        const f = Math.round(u.loaded * 100 / u.total);
-                        j.value = f, o?.onUploadProgress?.(f);
+                    onUploadProgress: (f) => {
+                      if (f.total) {
+                        const d = Math.round(f.loaded * 100 / f.total);
+                        j.value = d, o?.onUploadProgress?.(d);
                       }
                     }
                   };
                   if (s.onBeforeRequest) {
-                    const u = await s.onBeforeRequest(t);
-                    u !== void 0 && Object.assign(t, u);
+                    const f = await s.onBeforeRequest(t);
+                    f !== void 0 && Object.assign(t, f);
                   }
                   if (o?.onBeforeRequest) {
-                    const u = await o.onBeforeRequest(t);
-                    u !== void 0 && Object.assign(t, u);
+                    const f = await o.onBeforeRequest(t);
+                    f !== void 0 && Object.assign(t, f);
                   }
-                  b.value = void 0, p.value = void 0;
-                  const c = await h.request(t), E = s.response ? s.response.parse(c.data) : c.data;
-                  a.value = E, o?.onResult?.(E);
-                } catch (n) {
-                  if (n instanceof L) {
-                    const l = n.response?.data?.message || n.message || "An error occurred", y = n.response?.status, q = n.code;
-                    b.value = l, o?.onError?.(n), e.onErrorRequest?.({ err: n, message: l, status: y, code: q });
-                  } else if (n instanceof F) {
-                    p.value = P.flattenError(n);
-                    const l = Object.keys(p.value.fieldErrors).length, y = `${Object.values(p.value.fieldErrors).at(0)}.${l > 1 ? ` (and ${l - 1} more errors)` : ""}`;
-                    b.value = y, o?.onError?.(n), o?.onZodError?.(P.flattenError(n)), e.onErrorRequest?.({ err: n, message: y, code: "VALIDATION_ERROR" }), e.onZodError && e.onZodError(P.flattenError(n));
+                  g.value = void 0, v.value = void 0;
+                  const u = await h.request(t), b = s.response ? s.response.parse(u.data) : u.data;
+                  a.value = b, o?.onResult?.(b);
+                } catch (i) {
+                  if (i instanceof Z) {
+                    const l = i.response?.data?.message || i.message || "An error occurred";
+                    g.value = l, o?.onError?.(i), e.onError?.({ err: i, message: l });
+                  } else if (i instanceof F) {
+                    v.value = A.flattenError(i);
+                    const l = Object.keys(v.value.fieldErrors).length, R = `${Object.values(v.value.fieldErrors).at(0)}.${l > 1 ? ` (and ${l - 1} more errors)` : ""}`;
+                    g.value = R, o?.onError?.(i), o?.onZodError?.(A.flattenError(i)), e.onError?.({ err: i, message: R }), e.onZodError && e.onZodError(A.flattenError(i));
                   } else {
-                    const l = n.message || "An error occurred";
-                    b.value = l, o?.onError?.(n), e.onErrorRequest?.({ err: n, message: l });
+                    const l = i.message || "An error occurred";
+                    g.value = l, o?.onError?.(i), e.onError?.({ err: i, message: l });
                   }
                 } finally {
-                  g.value = !1, C.value = !0;
+                  E.value = !1, C.value = !0;
                 }
               }
             } };
           };
-        } else typeof d == "object" && (i[m] = S(d));
+        } else typeof c == "object" && (n[m] = S(c));
     }
-    return i;
+    return n;
   }
-  const _ = e.mutations ?? {}, x = S(_);
+  const T = e.mutations ?? {}, $ = S(T);
   return {
-    query: Z,
-    mutation: x
+    query: L,
+    mutation: $
   };
 }
 function O(e) {
@@ -242,11 +243,12 @@ function te(...e) {
   return Object.assign({}, ...e);
 }
 export {
-  ae as AxiosError,
+  ie as AxiosError,
+  ae as ZodError,
   Y as createApiClient,
   ee as defineMutation,
   O as defineQuery,
   te as mergeMutations,
   re as mergeQueries,
-  W as z
+  G as z
 };

package/package.json

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