Merge pull request #51 from alovajs/release/v1.4.x

fix: fix that wrong data type of usepagination
alovajs · Feb 16, 2024 · 020f53f · 020f53f
2 parents 1815b6e + 2e269b5
commit 020f53f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 11 deletions.
diff --git a/packages/scene-react/typings/general.d.ts b/packages/scene-react/typings/general.d.ts
@@ -706,7 +706,7 @@ interface TokenAuthenticationOptions<RA extends AlovaRequestAdapter<any, any, an
    * 赋值token回调函数，登录标识和访客标识的请求不会触发此函数
    * @param method method实例
    */
-  assignToken?: (method: Parameters<RA>[1]) => void;
+  assignToken?: (method: Parameters<RA>[1]) => void | Promise<void>;
 }
 interface ClientTokenAuthenticationOptions<RA extends AlovaRequestAdapter<any, any, any, any, any>>
   extends TokenAuthenticationOptions<RA> {

diff --git a/packages/scene-react/typings/index.d.ts b/packages/scene-react/typings/index.d.ts
@@ -47,11 +47,14 @@ import {
 
 type ReactState<S> = [S, Dispatch<SetStateAction<S>>];
 
-type UsePaginationReturnType<S, E, R, T, RC, RE, RH, LD extends any[]> = UseHookReturnType<S, E, R, T, RC, RE, RH> & {
+type UsePaginationReturnType<S, E, R, T, RC, RE, RH, LD extends unknown[]> = Omit<
+  UseHookReturnType<S, E, R, T, RC, RE, RH>,
+  'data' | 'update'
+> & {
   page: ReactState<number>;
   pageSize: ReactState<number>;
   data: IsUnknown<
-    LD,
+    LD[number],
     R extends {
       data: any;
     }

diff --git a/packages/scene-svelte/typings/general.d.ts b/packages/scene-svelte/typings/general.d.ts
@@ -706,7 +706,7 @@ interface TokenAuthenticationOptions<RA extends AlovaRequestAdapter<any, any, an
    * 赋值token回调函数，登录标识和访客标识的请求不会触发此函数
    * @param method method实例
    */
-  assignToken?: (method: Parameters<RA>[1]) => void;
+  assignToken?: (method: Parameters<RA>[1]) => void | Promise<void>;
 }
 interface ClientTokenAuthenticationOptions<RA extends AlovaRequestAdapter<any, any, any, any, any>>
   extends TokenAuthenticationOptions<RA> {

diff --git a/packages/scene-svelte/typings/index.d.ts b/packages/scene-svelte/typings/index.d.ts
@@ -46,12 +46,15 @@ import {
   UnbindHandler
 } from './general';
 
-type UsePaginationReturnType<S, E, R, T, RC, RE, RH, LD extends any[]> = UseHookReturnType<S, E, R, T, RC, RE, RH> & {
+type UsePaginationReturnType<S, E, R, T, RC, RE, RH, LD extends unknown[]> = Omit<
+  UseHookReturnType<S, E, R, T, RC, RE, RH>,
+  'data' | 'update'
+> & {
   page: Writable<number>;
   pageSize: Writable<number>;
   data: Writable<
     IsUnknown<
-      LD,
+      LD[number],
       R extends {
         data: any;
       }

diff --git a/packages/scene-vue/typings/general.d.ts b/packages/scene-vue/typings/general.d.ts
@@ -706,7 +706,7 @@ interface TokenAuthenticationOptions<RA extends AlovaRequestAdapter<any, any, an
    * 赋值token回调函数，登录标识和访客标识的请求不会触发此函数
    * @param method method实例
    */
-  assignToken?: (method: Parameters<RA>[1]) => void;
+  assignToken?: (method: Parameters<RA>[1]) => void | Promise<void>;
 }
 interface ClientTokenAuthenticationOptions<RA extends AlovaRequestAdapter<any, any, any, any, any>>
   extends TokenAuthenticationOptions<RA> {

diff --git a/packages/scene-vue/typings/index.d.ts b/packages/scene-vue/typings/index.d.ts
@@ -46,12 +46,15 @@ import {
   UnbindHandler
 } from './general';
 
-type UsePaginationReturnType<S, E, R, T, RC, RE, RH, LD extends any[]> = UseHookReturnType<S, E, R, T, RC, RE, RH> & {
+type UsePaginationReturnType<S, E, R, T, RC, RE, RH, LD extends unknown[]> = Omit<
+  UseHookReturnType<S, E, R, T, RC, RE, RH>,
+  'data' | 'update'
+> & {
   page: Ref<number>;
   pageSize: Ref<number>;
   data: Ref<
     IsUnknown<
-      LD,
+      LD[number],
       R extends {
         data: any;
       }
@@ -123,11 +126,11 @@ declare function usePagination<
   RC,
   RE,
   RH,
-  LD extends any[],
+  LD extends unknown[],
   WS extends (WatchSource | object)[]
 >(
   handler: (page: number, pageSize: number) => Method<S, E, R, T, RC, RE, RH>,
-  config?: PaginationHookConfig<R, LD, WS>
+  config?: PaginationHookConfig<S, E, R, T, RC, RE, RH, LD, WS>
 ): UsePaginationReturnType<S, E, R, T, RC, RE, RH, LD>;
 
 /**