@kawaiininja/fetch 1.0.41 → 1.0.43

package/dist/hooks/useFetch.js

@@ -22,6 +22,7 @@ export const useFetch = (endpoint, baseOptions = {}) => {
         if (!mounted.current)
             return;
         setTimeout(() => {
+            // @ts-ignore
             if (mounted.current)
                 setState((prev) => ({ ...prev, ...fn(prev) }));
         }, 0);
@@ -69,16 +70,7 @@ export const useFetch = (endpoint, baseOptions = {}) => {
                 entry.promise = execution;
         }
         return execution;
-    }, [
-        endpoint,
-        cacheKey,
-        fetchCSRF,
-        apiUrl,
-        onError,
-        debug,
-        safeSet,
-        baseOptions,
-    ]);
+    }, [endpoint, cacheKey, fetchCSRF, apiUrl, onError, debug, safeSet, baseOptions]);
     useEffect(() => {
         if (!enabled)
             return;
@@ -86,7 +78,7 @@ export const useFetch = (endpoint, baseOptions = {}) => {
         if (shouldFetch) {
             request();
         }
-    }, [enabled, cacheKey, swr, staleTime]);
+    }, [enabled, cacheKey, swr, staleTime, request, cached?.data]);
     useEffect(() => {
         if (!baseOptions.revalidateOnFocus || !enabled)
             return;
@@ -107,16 +99,19 @@ export const useFetch = (endpoint, baseOptions = {}) => {
             abortRef.current.abort();
         };
     }, []);
-    const methods = useMemo(() => createApiMethods({
-        request,
-        baseUrl: apiUrl(endpoint),
-        safeSet,
-    }), [request, endpoint, apiUrl, safeSet]);
-    return useMemo(() => ({
-        state,
-        isLoading: state.loading,
-        isError: !!state.error,
-        isSuccess: !!state.data && !state.error,
-        ...methods,
-    }), [state, methods]);
+    return useMemo(() => {
+        const methods = createApiMethods({
+            request,
+            baseUrl: apiUrl(endpoint),
+            safeSet,
+            apiUrl,
+        });
+        return {
+            state,
+            isLoading: state.loading,
+            isError: !!state.error,
+            isSuccess: !!state.data && !state.error,
+            ...methods,
+        };
+    }, [state, request, endpoint, apiUrl, safeSet]);
 };

package/dist/hooks/utils.d.ts

@@ -18,13 +18,13 @@ export interface ApiSurface<T = any> {
     blob: (config?: RequestOptions) => Promise<Blob | undefined>;
     upload: <R = T>(formData: FormData, config?: RequestOptions) => Promise<R | undefined>;
 }
-interface CreateApiSurfaceParams<T> {
-    state: FetchState<T>;
+interface CreateApiMethodsParams<T> {
     request: <R = T>(options?: RequestOptions) => Promise<R | undefined>;
     baseUrl: string;
     safeSet: (fn: (prev: FetchState<T>) => Partial<FetchState<T>>) => void;
+    apiUrl: (path: string) => string;
 }
-export declare const createApiMethods: <T = any>({ request, baseUrl, safeSet, }: Omit<CreateApiSurfaceParams<T>, "state">) => {
+export declare const createApiMethods: <T = any>({ request, baseUrl, safeSet, apiUrl, }: CreateApiMethodsParams<T>) => {
     request: <R = T>(options?: RequestOptions) => Promise<R | undefined>;
     refetch: () => Promise<T | undefined>;
     setData: (value: T | null | ((prev: T | null) => T | null)) => void;
@@ -39,5 +39,4 @@ export declare const createApiMethods: <T = any>({ request, baseUrl, safeSet, }:
     blob: (config?: RequestOptions) => Promise<Blob | undefined>;
     upload: <R_4 = T>(formData: FormData, config?: RequestOptions) => Promise<R_4 | undefined>;
 };
-export declare const createApiSurface: <T = any>({ state, request, baseUrl, safeSet, }: CreateApiSurfaceParams<T>) => ApiSurface<T>;
 export {};

package/dist/hooks/utils.js

@@ -1,6 +1,4 @@
-import { useApiConfig } from "./useApiConfig";
-export const createApiMethods = ({ request, baseUrl, safeSet, }) => {
-    const { apiUrl } = useApiConfig();
+export const createApiMethods = ({ request, baseUrl, safeSet, apiUrl, }) => {
     const withJsonBody = (data) => ({
         body: data != null ? JSON.stringify(data) : undefined,
         headers: { "Content-Type": "application/json" },
@@ -77,13 +75,3 @@ export const createApiMethods = ({ request, baseUrl, safeSet, }) => {
         }),
     };
 };
-export const createApiSurface = ({ state, request, baseUrl, safeSet, }) => {
-    const methods = createApiMethods({ request, baseUrl, safeSet });
-    return {
-        state,
-        isLoading: state.loading,
-        isError: !!state.error,
-        isSuccess: !!state.data && !state.error,
-        ...methods,
-    };
-};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kawaiininja/fetch",
-    "version": "1.0.41",
+    "version": "1.0.43",
     "description": "Core fetch utility for Onyx Framework",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",