From 49e3717c5cd572ceb3f2f97588b49e6965a79210 Mon Sep 17 00:00:00 2001
From: Wouter Roozeleer <wouter.roozeleer@mediagenix.tv>
Date: Mon, 18 Dec 2023 22:48:46 +0100
Subject: [PATCH 1/2] fix: swr, tanstack and client should not have generics

---
 .../src/components/Mutation.tsx                      |  2 +-
 .../swagger-tanstack-query/src/components/Query.tsx  | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/swagger-tanstack-query/src/components/Mutation.tsx b/packages/swagger-tanstack-query/src/components/Mutation.tsx
index 7e4dd26fb..7d52969a8 100644
--- a/packages/swagger-tanstack-query/src/components/Mutation.tsx
+++ b/packages/swagger-tanstack-query/src/components/Mutation.tsx
@@ -98,7 +98,7 @@ function Template({
   }
 
   return (
-    <Function export name={name} generics={generics} returnType={returnType} params={params} JSDoc={JSDoc}>
+    <Function export name={name} returnType={returnType} params={params} JSDoc={JSDoc}>
       {`
        const { mutation: mutationOptions, client: clientOptions = {} } = options ?? {}
 
diff --git a/packages/swagger-tanstack-query/src/components/Query.tsx b/packages/swagger-tanstack-query/src/components/Query.tsx
index f3b2cff48..632bf0940 100644
--- a/packages/swagger-tanstack-query/src/components/Query.tsx
+++ b/packages/swagger-tanstack-query/src/components/Query.tsx
@@ -62,7 +62,7 @@ function Template({
   if (isV5) {
     return (
       <>
-        <Function name={name} export generics={generics} returnType={resolvedReturnType} params={params} JSDoc={JSDoc}>
+        <Function name={name} export returnType={resolvedReturnType} params={params} JSDoc={JSDoc}>
           {`
          const { query: queryOptions, client: clientOptions = {} } = options ?? {}
          const queryKey = queryOptions?.queryKey ?? ${hook.queryKey}
@@ -85,7 +85,7 @@ function Template({
 
   return (
     <>
-      <Function name={name} export generics={generics} returnType={resolvedReturnType} params={params} JSDoc={JSDoc}>
+      <Function name={name} export returnType={resolvedReturnType} params={params} JSDoc={JSDoc}>
         {`
        const { query: queryOptions, client: clientOptions = {} } = options ?? {}
        const queryKey = queryOptions?.queryKey ?? ${hook.queryKey}
@@ -302,7 +302,6 @@ export function Query({
     pluginKey,
   })
 
-  const generics = new FunctionParams()
   const params = new FunctionParams()
   const queryParams = new FunctionParams()
   const client = {
@@ -314,12 +313,6 @@ export function Query({
     withHeaders: !!schemas.headerParams?.name,
   }
 
-  generics.add([
-    { type: 'TData', default: `${factory.name}["response"]` },
-    suspense ? undefined : { type: 'TQueryData', default: `${factory.name}["response"]` },
-    { type: `TQueryKey extends QueryKey`, default: queryKeyType },
-  ])
-
   const pathParams = getParams(schemas.pathParams, {}).toString()
   const resultGenerics = [
     `TData`,
@@ -402,7 +395,6 @@ export function Query({
 
       <Template
         name={[name, infinite ? 'Infinite' : undefined, suspense ? 'Suspense' : undefined].filter(Boolean).join('')}
-        generics={generics.toString()}
         JSDoc={{ comments: getComments(operation) }}
         params={params.toString()}
         returnType={`${resultType}<${resultGenerics.join(', ')}>`}

From a89bb5318b86d5d28ff0d252b85b42ba515c8f6e Mon Sep 17 00:00:00 2001
From: xPhentom <phentom@live.be>
Date: Wed, 20 Dec 2023 22:56:02 +0100
Subject: [PATCH 2/2] update snapshots

---
 .../src/components/__snapshots__/Mutation.test.tsx.snap         | 2 +-
 .../src/components/__snapshots__/Query.test.tsx.snap            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/swagger-tanstack-query/src/components/__snapshots__/Mutation.test.tsx.snap b/packages/swagger-tanstack-query/src/components/__snapshots__/Mutation.test.tsx.snap
index 78e7d8c8b..da53c86f9 100644
--- a/packages/swagger-tanstack-query/src/components/__snapshots__/Mutation.test.tsx.snap
+++ b/packages/swagger-tanstack-query/src/components/__snapshots__/Mutation.test.tsx.snap
@@ -41,7 +41,7 @@ export function CreatePetsQueryOptions<TData = CreatePets['response'], TQueryDat
  * @summary Create a pet
  * @link /pets */
 
-export function useCreatePets<TData = CreatePets['response'], TQueryData = CreatePets['response'], TQueryKey extends QueryKey = CreatePetsQueryKey>(
+export function useCreatePets(
   options: {
     query?: UseBaseQueryOptions<CreatePets['data'], CreatePets['error'], TData, TQueryData, TQueryKey>
     client?: CreatePets['client']['parameters']
diff --git a/packages/swagger-tanstack-query/src/components/__snapshots__/Query.test.tsx.snap b/packages/swagger-tanstack-query/src/components/__snapshots__/Query.test.tsx.snap
index a8b4b87d6..2f94f0ff4 100644
--- a/packages/swagger-tanstack-query/src/components/__snapshots__/Query.test.tsx.snap
+++ b/packages/swagger-tanstack-query/src/components/__snapshots__/Query.test.tsx.snap
@@ -43,7 +43,7 @@ export function ShowPetByIdQueryOptions<TData = ShowPetById['response'], TQueryD
  * @summary Info for a specific pet
  * @link /pets/:petId */
 
-export function useShowPetById<TData = ShowPetById['response'], TQueryData = ShowPetById['response'], TQueryKey extends QueryKey = ShowPetByIdQueryKey>(
+export function useShowPetById(
   petId: ShowPetByIdPathParams['petId'],
   testId: ShowPetByIdPathParams['testId'],
   options: {