vue-api-kit 1.10.11 → 1.11.0

package/dist/index.js

@@ -1,9 +1,9 @@
-import k, { ZodError as x } from "zod";
+import k, { ZodError as Z } from "zod";
 import * as I from "zod";
 import { ZodError as ne } from "zod";
-import U, { AxiosError as S } from "axios";
+import U, { AxiosError as x } from "axios";
 import { AxiosError as ie } from "axios";
-import { nextTick as _, ref as g, onMounted as Q, watch as z, onBeforeUnmount as N } from "vue";
+import { nextTick as _, ref as p, onMounted as Q, watch as z, onBeforeUnmount as N } from "vue";
 import { debounce as H } from "lodash-es";
 function W(e) {
   return e && typeof e == "object" && e !== null && typeof e.path == "string";
@@ -72,11 +72,11 @@ function K(e) {
     if (!r.url) return r;
     const i = (v) => {
       if (v)
-        for (const [m, o] of Object.entries(v)) {
+        for (const [m, t] of Object.entries(v)) {
           const s = `{${m}}`;
           r.url.includes(s) && (r.url = r.url.replace(
             s,
-            encodeURIComponent(String(o))
+            encodeURIComponent(String(t))
           ), delete v[m]);
         }
     };
@@ -111,51 +111,51 @@ function K(e) {
       const m = r[v];
       if (m)
         if (W(m)) {
-          const o = m;
+          const t = m;
           i[v] = (s) => {
             let n;
             s && typeof s == "object" && ("loadOnMount" in s || "debounce" in s || "onResult" in s || "onError" in s || "onZodError" in s || "onBeforeRequest" in s || "params" in s || "data" in s ? n = s : n = { params: s });
-            const R = g(), E = g(), p = g(), P = g(!1), A = g(!1), M = g(!0);
+            const R = p(), E = p(), g = p(), P = p(!1), A = p(!1), M = p(!0);
             let B = new AbortController();
             const u = () => {
               B?.abort(), B = new AbortController();
             }, f = async () => {
               P.value && u(), P.value = !0, E.value = void 0;
               try {
-                o.params && n?.params && o.params.parse(n.params);
-                let t = n?.data;
-                o.data && t && o.data.parse(t);
+                t.params && n?.params && t.params.parse(n.params);
+                let o = n?.data;
+                t.data && o && t.data.parse(o);
                 const c = {
-                  method: o.method ?? "GET",
-                  url: o.path,
+                  method: t.method ?? "GET",
+                  url: t.path,
                   params: n?.params,
                   signal: B.signal,
                   headers: {}
                 };
-                if (o.method === "POST" && t && (c.data = t), o.onBeforeRequest) {
-                  const y = await o.onBeforeRequest(c);
+                if (t.method === "POST" && o && (c.data = o), t.onBeforeRequest) {
+                  const y = await t.onBeforeRequest(c);
                   y !== void 0 && Object.assign(c, y);
                 }
                 if (n?.onBeforeRequest) {
                   const y = await n.onBeforeRequest(c);
                   y !== void 0 && Object.assign(c, y);
                 }
-                E.value = void 0, p.value = void 0;
-                const j = await a.request(c), d = o.response ? o.response.parse(j.data) : j.data;
+                E.value = void 0, g.value = void 0;
+                const j = await a.request(c), d = t.response ? t.response.parse(j.data) : j.data;
                 R.value = d, n?.onResult?.(d);
-              } catch (t) {
-                if (t instanceof S) {
-                  if (t.code !== "ERR_CANCELED") {
-                    const c = t.response?.data?.message || t.message || "An error occurred";
-                    E.value = c, n?.onError?.(t), e.onError?.({ err: t, message: c });
+              } catch (o) {
+                if (o instanceof x) {
+                  if (o.code !== "ERR_CANCELED") {
+                    const c = o.response?.data?.message || o.message || "An error occurred";
+                    E.value = c, n?.onError?.(o), e.onError?.({ err: o, message: c });
                   }
-                } else if (t instanceof x) {
-                  p.value = k.flattenError(t);
-                  const c = Object.keys(p.value.fieldErrors).length, j = `${Object.values(p.value.fieldErrors).at(0)}.${c > 1 ? ` (and ${c - 1} more errors)` : ""}`;
-                  E.value = j, n?.onError?.(t), n?.onZodError?.(k.flattenError(t)), e.onError?.({ err: t, message: j }), e.onZodError && e.onZodError(k.flattenError(t));
+                } else if (o instanceof Z) {
+                  console.warn("Zod validation error at:", t.method, t.path), g.value = k.flattenError(o);
+                  const c = Object.keys(g.value.fieldErrors).length, j = `${Object.values(g.value.fieldErrors).at(0)}.${c > 1 ? ` (and ${c - 1} more errors)` : ""}`;
+                  E.value = j, n?.onError?.(o), n?.onZodError?.(k.flattenError(o)), e.onError?.({ err: o, message: j }), e.onZodError && e.onZodError(k.flattenError(o));
                 } else {
-                  const c = t.message || "An error occurred";
-                  E.value = c, n?.onError?.(c), e.onError?.({ err: t, message: c });
+                  const c = o.message || "An error occurred";
+                  E.value = c, n?.onError?.(c), e.onError?.({ err: o, message: c });
                 }
               } finally {
                 P.value = !1, A.value = !0;
@@ -172,38 +172,38 @@ function K(e) {
               );
             }), N(() => {
               b && b(), B?.abort();
-            })), (n?.loadOnMount === void 0 || n.loadOnMount) && !A.value && (M.value ? (M.value = !1, f()) : q()), { result: R, errorMessage: E, zodError: p, isLoading: P, isDone: A, refetch: f };
+            })), (n?.loadOnMount === void 0 || n.loadOnMount) && !A.value && (M.value ? (M.value = !1, f()) : q()), { result: R, errorMessage: E, zodError: g, isLoading: P, isDone: A, refetch: f };
           };
         } else typeof m == "object" && (i[v] = C(m));
     }
     return i;
   }
-  const w = e.queries ?? {}, Z = C(w);
+  const w = e.queries ?? {}, S = C(w);
   function F(r) {
     const i = {};
     for (const v in r) {
       const m = r[v];
       if (m)
         if (X(m)) {
-          const o = m;
+          const t = m;
           i[v] = (s) => {
-            const n = g(), R = g(), E = g(), p = g(!1), P = g(!1), A = g(0);
-            return { result: n, errorMessage: R, zodError: E, isLoading: p, isDone: P, uploadProgress: A, mutate: async (B) => {
-              if (!p.value) {
-                p.value = !0, R.value = void 0, A.value = 0;
+            const n = p(), R = p(), E = p(), g = p(!1), P = p(!1), A = p(0);
+            return { result: n, errorMessage: R, zodError: E, isLoading: g, isDone: P, uploadProgress: A, mutate: async (B) => {
+              if (!g.value) {
+                g.value = !0, R.value = void 0, A.value = 0;
                 try {
                   const { data: u = {}, params: f } = B ?? {};
                   let q = u ?? {}, b = {};
-                  if (o.isMultipart) {
+                  if (t.isMultipart) {
                     const d = new FormData();
                     for (const [y, D] of Object.entries(u))
                       $(d, D, y);
                     q = d, b["Content-Type"] = "multipart/form-data";
-                  } else o.data && o.data.parse(u);
-                  o.params && f && o.params.parse(f);
-                  const t = {
-                    method: o.method,
-                    url: o.path,
+                  } else t.data && t.data.parse(u);
+                  t.params && f && t.params.parse(f);
+                  const o = {
+                    method: t.method,
+                    url: t.path,
                     data: q,
                     params: f,
                     headers: b,
@@ -214,22 +214,22 @@ function K(e) {
                       }
                     }
                   };
-                  if (o.onBeforeRequest) {
-                    const d = await o.onBeforeRequest(t);
-                    d !== void 0 && Object.assign(t, d);
+                  if (t.onBeforeRequest) {
+                    const d = await t.onBeforeRequest(o);
+                    d !== void 0 && Object.assign(o, d);
                   }
                   if (s?.onBeforeRequest) {
-                    const d = await s.onBeforeRequest(t);
-                    d !== void 0 && Object.assign(t, d);
+                    const d = await s.onBeforeRequest(o);
+                    d !== void 0 && Object.assign(o, d);
                   }
                   R.value = void 0, E.value = void 0;
-                  const c = await a.request(t), j = o.response ? o.response.parse(c.data) : c.data;
+                  const c = await a.request(o), j = t.response ? t.response.parse(c.data) : c.data;
                   n.value = j, s?.onResult?.(j);
                 } catch (u) {
-                  if (u instanceof S) {
+                  if (u instanceof x) {
                     const f = u.response?.data?.message || u.message || "An error occurred";
                     R.value = f, s?.onError?.(u), e.onError?.({ err: u, message: f });
-                  } else if (u instanceof x) {
+                  } else if (u instanceof Z) {
                     E.value = k.flattenError(u);
                     const f = Object.keys(E.value.fieldErrors).length, q = `${Object.values(E.value.fieldErrors).at(0)}.${f > 1 ? ` (and ${f - 1} more errors)` : ""}`;
                     R.value = q, s?.onError?.(u), s?.onZodError?.(k.flattenError(u)), e.onError?.({ err: u, message: q }), e.onZodError && e.onZodError(k.flattenError(u));
@@ -238,7 +238,7 @@ function K(e) {
                     R.value = f, s?.onError?.(u), e.onError?.({ err: u, message: f });
                   }
                 } finally {
-                  p.value = !1, P.value = !0;
+                  g.value = !1, P.value = !0;
                 }
               }
             } };
@@ -249,7 +249,7 @@ function K(e) {
   }
   const T = e.mutations ?? {}, L = F(T);
   return {
-    query: Z,
+    query: S,
     mutation: L
   };
 }

package/package.json

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