feat(types): any replaces unknown as the response type when using js

Author: wangcch

src/request.ts

@@ -33,12 +33,14 @@ export type Request<
   K3 extends keyof T[K1][K2] = any,
 > = (...args: any[]) => Resource<T, D, K1, K2, K3>;
 
+type _AnyKeyValue<T, K> = K extends keyof T ? T[K] : any;
+
 export type Payload<T extends Request, Check = false> = Check extends true
-  ? ReturnType<T>["_payload_item"]
+  ? _AnyKeyValue<ReturnType<T>, "_payload_item">
   : T extends Request<AxiosResponse>
-  ? NonNullable<ReturnType<T>["_payload"]>
-  : ReturnType<T>["_payload"];
-export type BodyData<T extends Request> = ReturnType<T>["data"];
+  ? Exclude<_AnyKeyValue<ReturnType<T>, "_payload">, undefined>
+  : _AnyKeyValue<ReturnType<T>, "_payload">;
+export type BodyData<T extends Request> = _AnyKeyValue<ReturnType<T>, "data">;
 
 export interface RequestFactory<T extends Request> {
   (...args: Parameters<T>): {
@@ -95,7 +97,7 @@ export function _request<
 /**
  * For TypeScript type deduction
  */
-export const request = <T, D = any>(config: AxiosRequestConfig<D>) =>
+export const request = <T = any, D = any>(config: AxiosRequestConfig<D>) =>
   _request<AxiosResponse<T, D>, D>(config);
 
 export function createRequestError<

tests/setup/mock-request.ts

@@ -65,6 +65,19 @@ export const getAPIFuncs = (widthBaseUrl?: boolean) => {
           method: "get",
           url: "/users",
         }),
+      // for type checking
+      anyTypeList: () => ({
+        baseURL,
+        method: "get",
+        url: "/users",
+      }),
+      // for type checking
+      anyTypeWithoutGenericityList: () =>
+        request({
+          baseURL,
+          method: "get",
+          url: "/users",
+        }),
       get: (params?: { id: string }) =>
         request<MockDataUserItem>({
           baseURL,

tests/useRequest.test.ts

@@ -29,6 +29,45 @@ describe("useRequest", () => {
     expect(response.status).toBe(200);
   });
 
+  test("any type (without `request`)", async () => {
+    const [createRequest] = useRequest(getAPIFuncs(true).user.anyTypeList, {
+      onCompleted(data, response) {
+        expectTypeOf(data).toEqualTypeOf<any>();
+        expectTypeOf(response).toEqualTypeOf<any>();
+        expect(data).toStrictEqual(MOCK_DATA_USER_LIST);
+        expect(response.data).toStrictEqual(MOCK_DATA_USER_LIST);
+      },
+    });
+
+    const [data, response] = await createRequest().ready();
+    expect(data).toStrictEqual(MOCK_DATA_USER_LIST);
+    expect(response.data).toStrictEqual(MOCK_DATA_USER_LIST);
+    expect(response.status).toBe(200);
+    expectTypeOf(data).toEqualTypeOf<any>();
+    expectTypeOf(response).toEqualTypeOf<any>();
+  });
+
+  test("any type (`request` without genericity)", async () => {
+    const [createRequest] = useRequest(
+      getAPIFuncs(true).user.anyTypeWithoutGenericityList,
+      {
+        onCompleted(data, response) {
+          expectTypeOf(data).toEqualTypeOf<any>();
+          expectTypeOf(response).toEqualTypeOf<AxiosResponse<any>>();
+          expect(data).toStrictEqual(MOCK_DATA_USER_LIST);
+          expect(response.data).toStrictEqual(MOCK_DATA_USER_LIST);
+        },
+      },
+    );
+
+    const [data, response] = await createRequest().ready();
+    expect(data).toStrictEqual(MOCK_DATA_USER_LIST);
+    expect(response.data).toStrictEqual(MOCK_DATA_USER_LIST);
+    expect(response.status).toBe(200);
+    expectTypeOf(data).toEqualTypeOf<any>();
+    expectTypeOf(response).toEqualTypeOf<AxiosResponse<any>>();
+  });
+
   test("check createRequest", async () => {
     const Component = defineComponent({
       setup() {

tests/useResource.test.ts

@@ -82,6 +82,49 @@ describe("useResource", () => {
     expect(wrapper.get('[data-t-id="res.isLoading"]').text()).toBe("false");
   });
 
+  test("any type (without `request`)", async () => {
+    defineComponent({
+      setup() {
+        const [res] = useResource(getAPIFuncs(true).user.anyTypeList, false, {
+          onCompleted: (d, r) => {
+            expectTypeOf(d).toEqualTypeOf<any>();
+            expectTypeOf(r).toEqualTypeOf<any>();
+          },
+        });
+
+        const _unref_res = unref(res);
+
+        expectTypeOf(_unref_res.data).toEqualTypeOf<any>();
+        expectTypeOf(_unref_res.response).toEqualTypeOf<any>();
+        return () => h("div");
+      },
+    });
+  });
+  test("any type (`request` without genericity)", async () => {
+    defineComponent({
+      setup() {
+        const [res] = useResource(
+          getAPIFuncs(true).user.anyTypeWithoutGenericityList,
+          false,
+          {
+            onCompleted: (d, r) => {
+              expectTypeOf(d).toEqualTypeOf<any>();
+              expectTypeOf(r).toEqualTypeOf<AxiosResponse<any>>();
+            },
+          },
+        );
+
+        const _unref_res = unref(res);
+
+        expectTypeOf(_unref_res.data).toEqualTypeOf<any>();
+        expectTypeOf(_unref_res.response).toEqualTypeOf<
+          AxiosResponse<any> | undefined
+        >();
+        return () => h("div");
+      },
+    });
+  });
+
   test("options: filter", async () => {
     const Component = defineComponent({
       setup() {