vue-api-kit 1.13.0 → 1.14.0

package/dist/core/types.d.ts

@@ -216,6 +216,7 @@ export interface QueryResult<TResult> {
     isLoading: Ref<boolean>;
     isDone: Ref<boolean>;
     refetch: () => Promise<void>;
+    cancel: () => void;
 }
 /**
  * Return type from a mutation hook
@@ -240,4 +241,5 @@ export interface MutationResult<TResult, TData = any, TParams = any> {
         data?: TData;
         params?: TParams;
     }) => Promise<void>;
+    cancel: () => void;
 }

package/dist/index.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vue-api-kit",
   "type": "module",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "A powerful and flexible API client for Vue 3 applications, built with TypeScript and Zod for type-safe API interactions.",
   "keywords": [
     "vue3",
@@ -22,7 +22,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/MelvishNiz/vue-api-kit.git"
+    "url": "https://github.com/BuntuProject/vue-api-kit.git"
   },
   "scripts": {
     "dev": "vite build --watch",