vue-api-kit 1.12.1 → 1.14.0

package/README.md

@@ -436,6 +436,8 @@ mutations: {
     method: 'POST',
     path: '/upload',
     isMultipart: true,
+    // Optional: Laravel-friendly boolean serialization in multipart (true => "1", false => "0")
+    multipartBooleanStyle: 'numeric',
     response: z.object({ url: z.string() })
   }
 }

package/dist/core/types.d.ts

@@ -64,6 +64,7 @@ export interface ApiMutation<TData extends ZodType<any> | undefined = ZodType<an
     data?: TData;
     response?: TResponse;
     isMultipart?: boolean;
+    multipartBooleanStyle?: "trueFalse" | "numeric";
     onBeforeRequest?: (config: InternalAxiosRequestConfig<any>) => Promise<any> | void | any;
 }
 /**
@@ -215,6 +216,7 @@ export interface QueryResult<TResult> {
     isLoading: Ref<boolean>;
     isDone: Ref<boolean>;
     refetch: () => Promise<void>;
+    cancel: () => void;
 }
 /**
  * Return type from a mutation hook
@@ -239,4 +241,5 @@ export interface MutationResult<TResult, TData = any, TParams = any> {
         data?: TData;
         params?: TParams;
     }) => Promise<void>;
+    cancel: () => void;
 }

package/dist/index.js

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