vue-api-kit 1.10.4 → 1.10.6

package/dist/core/types.d.ts

@@ -1,7 +1,7 @@
 import { AxiosError, InternalAxiosRequestConfig } from 'axios';
 import { Ref } from 'vue';
 import { ZodError, ZodType } from 'zod';
-import { $ZodIssue } from 'zod/v4/core';
+import { $ZodFlattenedError } from 'zod/v4/core';
 /**
  * HTTP methods supported by the API client
  * @example
@@ -129,14 +129,11 @@ 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;
-        data?: any;
-        url?: string;
     }) => void;
-    onZodError?: (issues: Omit<$ZodIssue, "input">[]) => void;
+    onZodError?: (zodError: $ZodFlattenedError<any, any>) => void;
 }
 /**
  * Options for configuring a query hook
@@ -165,7 +162,7 @@ export interface UseQueryOptions<TParams = any, TData = any, TResult = any> {
     debounce?: number;
     onResult?: (result: TResult) => void;
     onError?: (error: AxiosError | ZodError | Error) => void;
-    onZodError?: (issues: Omit<$ZodIssue, "input">[]) => void;
+    onZodError?: (zodError: $ZodFlattenedError<any, any>) => void;
     onBeforeRequest?: (config: InternalAxiosRequestConfig<any>) => Promise<any> | void | any;
 }
 /**
@@ -181,7 +178,7 @@ export interface UseQueryOptions<TParams = any, TData = any, TResult = any> {
 export interface UseMutationOptions<TResult = any> {
     onResult?: (result: TResult) => void;
     onError?: (error: AxiosError | ZodError | Error) => void;
-    onZodError?: (issues: Omit<$ZodIssue, "input">[]) => void;
+    onZodError?: (zodError: $ZodFlattenedError<any, any>) => void;
     onUploadProgress?: (progress: number) => void;
     onBeforeRequest?: (config: InternalAxiosRequestConfig<any>) => Promise<any> | void | any;
 }
@@ -199,7 +196,7 @@ export interface UseMutationOptions<TResult = any> {
 export interface QueryResult<TResult> {
     result: Ref<TResult | undefined>;
     errorMessage: Ref<string | undefined>;
-    zodErrors: Ref<Omit<$ZodIssue, "input">[] | undefined>;
+    zodError: Ref<$ZodFlattenedError<any, any> | undefined>;
     isLoading: Ref<boolean>;
     isDone: Ref<boolean>;
     refetch: () => Promise<void>;
@@ -219,7 +216,7 @@ export interface QueryResult<TResult> {
 export interface MutationResult<TResult, TData = any, TParams = any> {
     result: Ref<TResult | undefined>;
     errorMessage: Ref<string | undefined>;
-    zodErrors: Ref<Omit<$ZodIssue, "input">[] | undefined>;
+    zodError: Ref<$ZodFlattenedError<any, any> | undefined>;
     isLoading: Ref<boolean>;
     isDone: Ref<boolean>;
     uploadProgress: Ref<number>;

package/dist/index.js

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

package/package.json

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