Fix swr config generic

src/index.ts

@@ -32,10 +32,11 @@ export function makeHookFactory<Paths extends {}>(
         ErrorResponse<ResponseObjectMap<Req>>,
         MediaType
       >,
-    >(fetchOptions: Options | null, swrConfig?: SWRConfiguration<Data, Error>) {
+      Config extends SWRConfiguration<Data, Error>,
+    >(fetchOptions: Options | null, swrConfig?: Config) {
       type Key = [typeof keyPrefix, Path, Options] | null;
 
-      return useSWR<Data, Error, Key>(
+      return useSWR<Data, Error, Key, Config>(
         // SWR key is based on the path and fetch options
         // keyPrefix keeps each API's cache separate in case there are path collisions
         fetchOptions ? [keyPrefix, path, fetchOptions] : null,

test/index.spec.ts

@@ -1,8 +1,9 @@
 import createClient from "openapi-fetch";
-import type { paths } from "../petstore";
+import type { paths } from "../generated/petstore";
 import { makeHookFactory } from "../src/index";
 
 import { expectTypeOf } from "expect-type";
+import { SuccessResponseJSON } from "openapi-typescript-helpers";
 
 const petStoreApi = createClient<paths>({
   baseUrl: "https://petstore3.swagger.io/api/v3",
@@ -12,14 +13,32 @@ const petStoreHook = makeHookFactory<paths>(petStoreApi, "pet-store");
 
 const useOrder = petStoreHook("/store/order/{orderId}");
 
+type OrderSuccessResponse = SuccessResponseJSON<
+  paths["/store/order/{orderId}"]["get"]
+>;
+
+// Test regular hook
 const { data } = useOrder({
   params: {
     path: { orderId: 1 },
   },
 });
 
+expectTypeOf(data).not.toEqualTypeOf<OrderSuccessResponse>();
+expectTypeOf(data).toEqualTypeOf<undefined | OrderSuccessResponse>();
+
 if (data) {
-  expectTypeOf(data).toEqualTypeOf<
-    paths["/store/order/{orderId}"]["get"]["responses"]["200"]["content"]["application/json"]
-  >();
+  expectTypeOf(data).toEqualTypeOf<OrderSuccessResponse>();
 }
+
+// Test suspense hook
+const { data: suspenseData } = useOrder(
+  {
+    params: {
+      path: { orderId: 1 },
+    },
+  },
+  { suspense: true }
+);
+
+expectTypeOf(suspenseData).toEqualTypeOf<OrderSuccessResponse>();

test/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "../tsconfig.json",
-  "include": ["./src/**/*", "**/*"],
+  "include": ["../src/**/*", "**/*"],
   "compilerOptions": {
     "noEmit": true
   },