From 09c2ee5d42b1ddcce8160228274f2ce18d979f88 Mon Sep 17 00:00:00 2001
From: "Gianmarco Rengucci (freshgiammi)" <rengucci.gianmarco@gmail.com>
Date: Thu, 10 Oct 2024 17:04:42 +0200
Subject: [PATCH 1/2] add MethodResponse for openapi-react-query

---
 packages/openapi-react-query/src/index.ts        | 13 ++++++++++++-
 packages/openapi-react-query/test/index.test.tsx |  3 ++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/openapi-react-query/src/index.ts b/packages/openapi-react-query/src/index.ts
index 95b965472..a897ec4ba 100644
--- a/packages/openapi-react-query/src/index.ts
+++ b/packages/openapi-react-query/src/index.ts
@@ -11,7 +11,7 @@ import {
   useQuery,
   useSuspenseQuery,
 } from "@tanstack/react-query";
-import type { ClientMethod, FetchResponse, MaybeOptionalInit, Client as FetchClient } from "openapi-fetch";
+import type { ClientMethod, FetchResponse, MaybeOptionalInit, Client as FetchClient, ClientPathsWithMethod } from "openapi-fetch";
 import type { HttpMethod, MediaType, PathsWithMethod, RequiredKeysOf } from "openapi-typescript-helpers";
 
 type InitWithUnknowns<Init> = Init & { [key: string]: unknown };
@@ -93,6 +93,16 @@ export interface OpenapiQueryClient<Paths extends {}, Media extends MediaType =
   useMutation: UseMutationMethod<Paths, Media>;
 }
 
+export type MethodResponse<
+  CreatedClient extends OpenapiQueryClient<any, any>,
+  Method extends HttpMethod,
+  Path extends ClientPathsWithMethod<FetchClient<any, any>, Method>,
+  Options = {}
+> =
+  CreatedClient extends OpenapiQueryClient<infer Paths extends { [key: string]: any }, infer Media extends MediaType>
+    ? NonNullable<FetchResponse<Paths[Path][Method], Options, Media>["data"]>
+    : never
+
 // TODO: Add the ability to bring queryClient as argument
 export default function createClient<Paths extends {}, Media extends MediaType = MediaType>(
   client: FetchClient<Paths, Media>,
@@ -141,3 +151,4 @@ export default function createClient<Paths extends {}, Media extends MediaType =
       ),
   };
 }
+
diff --git a/packages/openapi-react-query/test/index.test.tsx b/packages/openapi-react-query/test/index.test.tsx
index 20616bb36..5bdee1d76 100644
--- a/packages/openapi-react-query/test/index.test.tsx
+++ b/packages/openapi-react-query/test/index.test.tsx
@@ -1,7 +1,7 @@
 import { afterAll, beforeAll, describe, expect, it } from "vitest";
 import { server, baseUrl, useMockRequestHandler } from "./fixtures/mock-server.js";
 import type { paths } from "./fixtures/api.js";
-import createClient from "../src/index.js";
+import createClient, { type MethodResponse } from "../src/index.js";
 import createFetchClient from "openapi-fetch";
 import { fireEvent, render, renderHook, screen, waitFor, act } from "@testing-library/react";
 import { QueryClient, QueryClientProvider, useQueries } from "@tanstack/react-query";
@@ -212,6 +212,7 @@ describe("client", () => {
 
       const { data, error } = result.current;
 
+      expectTypeOf(data).toEqualTypeOf<MethodResponse<typeof client, "get", "/string-array"> | undefined>();      
       expectTypeOf(data).toEqualTypeOf<string[] | undefined>();
       expectTypeOf(error).toEqualTypeOf<{ code: number; message: string } | null>();
     });

From 624a335f3e7ad788ba2f9c88dccce2573a97e7f9 Mon Sep 17 00:00:00 2001
From: "Gianmarco Rengucci (freshgiammi)" <rengucci.gianmarco@gmail.com>
Date: Mon, 14 Oct 2024 11:02:22 +0200
Subject: [PATCH 2/2] improve Path param construction

---
 packages/openapi-react-query/src/index.ts        | 16 ++++++++--------
 packages/openapi-react-query/test/index.test.tsx |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/openapi-react-query/src/index.ts b/packages/openapi-react-query/src/index.ts
index a897ec4ba..d89d8f6c0 100644
--- a/packages/openapi-react-query/src/index.ts
+++ b/packages/openapi-react-query/src/index.ts
@@ -11,7 +11,7 @@ import {
   useQuery,
   useSuspenseQuery,
 } from "@tanstack/react-query";
-import type { ClientMethod, FetchResponse, MaybeOptionalInit, Client as FetchClient, ClientPathsWithMethod } from "openapi-fetch";
+import type { ClientMethod, FetchResponse, MaybeOptionalInit, Client as FetchClient } from "openapi-fetch";
 import type { HttpMethod, MediaType, PathsWithMethod, RequiredKeysOf } from "openapi-typescript-helpers";
 
 type InitWithUnknowns<Init> = Init & { [key: string]: unknown };
@@ -96,12 +96,13 @@ export interface OpenapiQueryClient<Paths extends {}, Media extends MediaType =
 export type MethodResponse<
   CreatedClient extends OpenapiQueryClient<any, any>,
   Method extends HttpMethod,
-  Path extends ClientPathsWithMethod<FetchClient<any, any>, Method>,
-  Options = {}
-> =
-  CreatedClient extends OpenapiQueryClient<infer Paths extends { [key: string]: any }, infer Media extends MediaType>
-    ? NonNullable<FetchResponse<Paths[Path][Method], Options, Media>["data"]>
-    : never
+  Path extends CreatedClient extends OpenapiQueryClient<infer Paths, infer _Media>
+    ? PathsWithMethod<Paths, Method>
+    : never,
+  Options = object,
+> = CreatedClient extends OpenapiQueryClient<infer Paths extends { [key: string]: any }, infer Media extends MediaType>
+  ? NonNullable<FetchResponse<Paths[Path][Method], Options, Media>["data"]>
+  : never;
 
 // TODO: Add the ability to bring queryClient as argument
 export default function createClient<Paths extends {}, Media extends MediaType = MediaType>(
@@ -151,4 +152,3 @@ export default function createClient<Paths extends {}, Media extends MediaType =
       ),
   };
 }
-
diff --git a/packages/openapi-react-query/test/index.test.tsx b/packages/openapi-react-query/test/index.test.tsx
index 5bdee1d76..91d8c5946 100644
--- a/packages/openapi-react-query/test/index.test.tsx
+++ b/packages/openapi-react-query/test/index.test.tsx
@@ -212,7 +212,7 @@ describe("client", () => {
 
       const { data, error } = result.current;
 
-      expectTypeOf(data).toEqualTypeOf<MethodResponse<typeof client, "get", "/string-array"> | undefined>();      
+      expectTypeOf(data).toEqualTypeOf<MethodResponse<typeof client, "get", "/string-array"> | undefined>();
       expectTypeOf(data).toEqualTypeOf<string[] | undefined>();
       expectTypeOf(error).toEqualTypeOf<{ code: number; message: string } | null>();
     });