cosey 0.11.9 → 0.11.11

package/hooks/useFetch.d.ts

@@ -11,9 +11,10 @@ interface UseFetchStale<T> {
     isFetching: ShallowRef<boolean>;
     data: ShallowRef<T | undefined>;
     error: ShallowRef<any>;
+    promise: ShallowRef<Promise<T>>;
 }
 interface UseFetchResult<T, U> extends UseFetchStale<T> {
     execute: (params?: U | undefined) => Promise<void>;
 }
-export declare function useFetch<T = any, U = any>(fetcher: (params: U) => Promise<any> | any, options?: UseFetchOptions<T>): UseFetchResult<T, U>;
+export declare function useFetch<T = any, U = any>(fetcher: (params: U) => Promise<T> | T, options?: UseFetchOptions<T>): UseFetchResult<T, U>;
 export {};

package/hooks/useFetch.js

@@ -4,18 +4,24 @@ import { isNullish } from '../utils/is.js';
 const staleMap = /* @__PURE__ */ new Map();
 function useFetch(fetcher, options = {}) {
   const { immediate = true, initialData, stale, onSuccess, onError, onFinally } = options;
-  const { isFetching, error, data } = !isNullish(stale) && staleMap.get(stale) || {
+  const { promise: firstPromise, resolve, reject } = Promise.withResolvers();
+  const { isFetching, error, data, promise } = !isNullish(stale) && staleMap.get(stale) || {
     isFetching: shallowRef(false),
     data: shallowRef(initialData),
-    error: shallowRef()
+    error: shallowRef(),
+    promise: shallowRef(firstPromise)
   };
   if (!isNullish(stale) && !staleMap.get(stale)) {
     staleMap.set(stale, {
       isFetching,
       error,
-      data
+      data,
+      promise
     });
   }
+  const promisedFetcher = async (params) => {
+    return await fetcher(params);
+  };
   async function execute(params) {
     if (isFetching.value) {
       return;
@@ -23,15 +29,18 @@ function useFetch(fetcher, options = {}) {
     try {
       error.value = void 0;
       isFetching.value = true;
-      const res = await fetcher(params);
+      promise.value = promisedFetcher(params);
+      const res = await promise.value;
       data.value = res;
       onSuccess?.(res);
+      resolve(res);
     } catch (err) {
       error.value = err;
       onError?.(err);
     } finally {
       isFetching.value = false;
       onFinally?.();
+      reject();
     }
   }
   if (immediate) {
@@ -45,7 +54,8 @@ function useFetch(fetcher, options = {}) {
     isFetching,
     error,
     data,
-    execute
+    execute,
+    promise
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosey",
-  "version": "0.11.9",
+  "version": "0.11.11",
   "description": "基于 Vue3 + vite 的后台管理系统框架",
   "type": "module",
   "main": "index.js",