@kubb/plugin-react-query 4.5.8 → 4.5.9

package/src/generators/__snapshots__/findByTags.ts

@@ -2,9 +2,9 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
-import fetch from '@kubb/plugin-client/clients/axios'
-import type { RequestConfig, ResponseErrorConfig } from '@kubb/plugin-client/clients/axios'
+import type { RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type { QueryKey, QueryClient, QueryObserverOptions, UseQueryResult } from '@tanstack/react-query'
+import { fetch } from './test/.kubb/fetch'
 import { queryOptions, useQuery } from '@tanstack/react-query'
 
 export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: '/pet/findByTags' }, ...(params ? [params] : [])] as const

package/src/generators/__snapshots__/findByTagsObject.ts

@@ -2,9 +2,9 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
-import fetch from '@kubb/plugin-client/clients/axios'
-import type { RequestConfig, ResponseErrorConfig } from '@kubb/plugin-client/clients/axios'
+import type { RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type { QueryKey, QueryClient, QueryObserverOptions, UseQueryResult } from '@tanstack/react-query'
+import { fetch } from './test/.kubb/fetch'
 import { queryOptions, useQuery } from '@tanstack/react-query'
 
 export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: '/pet/findByTags' }, ...(params ? [params] : [])] as const

package/src/generators/__snapshots__/findByTagsPathParamsObject.ts

@@ -2,9 +2,9 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
-import fetch from '@kubb/plugin-client/clients/axios'
-import type { RequestConfig, ResponseErrorConfig } from '@kubb/plugin-client/clients/axios'
+import type { RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type { QueryKey, QueryClient, QueryObserverOptions, UseQueryResult } from '@tanstack/react-query'
+import { fetch } from './test/.kubb/fetch'
 import { queryOptions, useQuery } from '@tanstack/react-query'
 
 export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: '/pet/findByTags' }, ...(params ? [params] : [])] as const

package/src/generators/__snapshots__/findByTagsWithCustomQueryKey.ts

@@ -2,9 +2,9 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
-import fetch from '@kubb/plugin-client/clients/axios'
-import type { RequestConfig, ResponseErrorConfig } from '@kubb/plugin-client/clients/axios'
+import type { RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type { QueryKey, QueryClient, QueryObserverOptions, UseQueryResult } from '@tanstack/react-query'
+import { fetch } from './test/.kubb/fetch'
 import { queryOptions, useQuery } from '@tanstack/react-query'
 
 export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => ['test', { url: '/pet/findByTags' }, ...(params ? [params] : [])] as const

package/src/generators/__snapshots__/findByTagsWithZod.ts

@@ -2,9 +2,9 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
-import fetch from '@kubb/plugin-client/clients/axios'
-import type { RequestConfig, ResponseErrorConfig } from '@kubb/plugin-client/clients/axios'
+import type { RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type { QueryKey, QueryClient, QueryObserverOptions, UseQueryResult } from '@tanstack/react-query'
+import { fetch } from './test/.kubb/fetch'
 import { queryOptions, useQuery } from '@tanstack/react-query'
 
 export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: '/pet/findByTags' }, ...(params ? [params] : [])] as const

package/src/generators/__snapshots__/findInfiniteByTags.ts

@@ -2,9 +2,9 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
-import fetch from '@kubb/plugin-client/clients/axios'
-import type { RequestConfig, ResponseErrorConfig } from '@kubb/plugin-client/clients/axios'
+import type { RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type { InfiniteData, QueryKey, QueryClient, InfiniteQueryObserverOptions, UseInfiniteQueryResult } from '@tanstack/react-query'
+import { fetch } from './test/.kubb/fetch'
 import { infiniteQueryOptions, useInfiniteQuery } from '@tanstack/react-query'
 
 export const findPetsByTagsInfiniteQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: '/pet/findByTags' }, ...(params ? [params] : [])] as const

package/src/generators/__snapshots__/findSuspenseByTags.ts

@@ -2,9 +2,9 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
-import fetch from '@kubb/plugin-client/clients/axios'
-import type { RequestConfig, ResponseErrorConfig } from '@kubb/plugin-client/clients/axios'
+import type { RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type { QueryKey, QueryClient, UseSuspenseQueryOptions, UseSuspenseQueryResult } from '@tanstack/react-query'
+import { fetch } from './test/.kubb/fetch'
 import { queryOptions, useSuspenseQuery } from '@tanstack/react-query'
 
 export const findPetsByTagsSuspenseQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: '/pet/findByTags' }, ...(params ? [params] : [])] as const

package/src/generators/__snapshots__/getPetIdCamelCase.ts

@@ -2,9 +2,9 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
-import fetch from '@kubb/plugin-client/clients/axios'
-import type { RequestConfig, ResponseErrorConfig } from '@kubb/plugin-client/clients/axios'
+import type { RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type { QueryKey, QueryClient, QueryObserverOptions, UseQueryResult } from '@tanstack/react-query'
+import { fetch } from './test/.kubb/fetch'
 import { queryOptions, useQuery } from '@tanstack/react-query'
 
 export const getPetByIdQueryKey = (petId: GetPetByIdPathParams['pet_id']) => [{ url: '/pet/:pet_id', params: { petId: petId } }] as const

package/src/generators/__snapshots__/postAsQuery.ts

@@ -2,9 +2,9 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
-import fetch from '@kubb/plugin-client/clients/axios'
-import type { RequestConfig, ResponseErrorConfig } from '@kubb/plugin-client/clients/axios'
+import type { RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type { QueryKey, QueryClient, QueryObserverOptions, UseQueryResult } from 'custom-query'
+import { fetch } from './test/.kubb/fetch'
 import { queryOptions, useQuery } from 'custom-query'
 
 export const updatePetWithFormQueryKey = (

package/src/generators/__snapshots__/updatePetById.ts

@@ -2,9 +2,9 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
-import fetch from '@kubb/plugin-client/clients/axios'
-import type { RequestConfig, ResponseErrorConfig } from '@kubb/plugin-client/clients/axios'
+import type { RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type { UseMutationOptions, UseMutationResult, QueryClient } from '@tanstack/react-query'
+import { fetch } from './test/.kubb/fetch'
 import { mutationOptions, useMutation } from '@tanstack/react-query'
 
 export const updatePetWithFormMutationKey = () => [{ url: '/pet/:pet_id' }] as const

package/src/generators/__snapshots__/updatePetByIdPathParamsObject.ts

@@ -2,9 +2,9 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
-import fetch from '@kubb/plugin-client/clients/axios'
-import type { RequestConfig, ResponseErrorConfig } from '@kubb/plugin-client/clients/axios'
+import type { RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type { UseMutationOptions, UseMutationResult, QueryClient } from '@tanstack/react-query'
+import { fetch } from './test/.kubb/fetch'
 import { mutationOptions, useMutation } from '@tanstack/react-query'
 
 export const updatePetWithFormMutationKey = () => [{ url: '/pet/:pet_id' }] as const

package/src/plugin.ts

@@ -14,7 +14,6 @@ import type { PluginReactQuery } from './types.ts'
 export const pluginReactQueryName = 'plugin-react-query' satisfies PluginReactQuery['name']
 
 export const pluginReactQuery = definePlugin<PluginReactQuery>((options) => {
-  const bundle = options.bundle ?? false
   const {
     output = { path: 'hooks', barrelType: 'named' },
     group,
@@ -34,21 +33,21 @@ export const pluginReactQuery = definePlugin<PluginReactQuery>((options) => {
     queryKey = QueryKey.getTransformer,
     paramsCasing,
     contentType,
+    client,
   } = options
 
-  const clientType = options.client?.client ?? 'axios'
-  const clientImportPath = options.client?.importPath ?? (!bundle ? `@kubb/plugin-client/clients/${clientType}` : undefined)
+  const clientType = client?.client ?? 'axios'
+  const clientImportPath = client?.importPath ?? (!client?.bundle ? `@kubb/plugin-client/clients/${clientType}` : undefined)
 
   return {
     name: pluginReactQueryName,
     options: {
-      bundle,
       output,
       client: {
+        ...options.client,
         client: clientType,
-        dataReturnType: options.client?.dataReturnType ?? 'data',
+        dataReturnType: client?.dataReturnType ?? 'data',
         pathParamsType,
-        baseURL: options.client?.baseURL,
         importPath: clientImportPath,
       },
       infinite: infinite
@@ -147,7 +146,7 @@ export const pluginReactQuery = definePlugin<PluginReactQuery>((options) => {
       const hasClientPlugin = !!this.pluginManager.getPluginByKey([pluginClientName])
       const containsFetch = this.fabric.files.some((file) => file.baseName === 'fetch.ts')
 
-      if (bundle && !hasClientPlugin && !this.plugin.options.client.importPath && !containsFetch) {
+      if (this.plugin.options.client.bundle && !hasClientPlugin && !this.plugin.options.client.importPath && !containsFetch) {
         // pre add bundled fetch
         await this.addFile({
           baseName: 'fetch.ts',

package/src/types.ts

@@ -89,14 +89,7 @@ export type Options = {
    * Group the @tanstack/query hooks based on the provided name.
    */
   group?: Group
-
-  client?: Pick<PluginClient['options'], 'client' | 'dataReturnType' | 'importPath' | 'baseURL'>
-  /**
-   * Bundle the selected client into the generated `.kubb` directory.
-   * When disabled the generated hooks will import the shared runtime from `@kubb/plugin-client/clients/*`.
-   * @default false
-   */
-  bundle?: boolean
+  client?: Pick<PluginClient['options'], 'client' | 'dataReturnType' | 'importPath' | 'baseURL' | 'bundle'>
   /**
    * Array containing exclude parameters to exclude/skip tags/operations/methods/paths.
    */
@@ -168,7 +161,6 @@ type ResolvedOptions = {
   output: Output<Oas>
   group: Options['group']
   client: NonNullable<PluginReactQuery['options']['client']>
-  bundle: boolean
   parser: Required<NonNullable<Options['parser']>>
   pathParamsType: NonNullable<Options['pathParamsType']>
   paramsCasing: Options['paramsCasing']