@kubb/plugin-client 5.0.0-beta.42 → 5.0.0-beta.56

package/dist/templates/clients/axios.source.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"axios.source.cjs","names":[],"sources":["../../../src/templates/clients/axios.source.ts"],"sourcesContent":["// @ts-expect-error - import attributes are handled at build time by importAttributeTextPlugin\nimport content from '../../../templates/clients/axios.ts' with { type: 'text' }\n\nexport const source = content as string\n"],"mappings":";;AAAA,MAAa,SAAS"}
+{"version":3,"file":"axios.source.cjs","names":[],"sources":[],"mappings":""}

package/dist/templates/clients/axios.source.js.map

@@ -1 +1 @@
-{"version":3,"file":"axios.source.js","names":[],"sources":["../../../src/templates/clients/axios.source.ts"],"sourcesContent":["// @ts-expect-error - import attributes are handled at build time by importAttributeTextPlugin\nimport content from '../../../templates/clients/axios.ts' with { type: 'text' }\n\nexport const source = content as string\n"],"mappings":";AAAA,MAAa,SAAS"}
+{"version":3,"file":"axios.source.js","names":[],"sources":[],"mappings":""}

package/dist/templates/clients/fetch.source.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.source.cjs","names":[],"sources":["../../../src/templates/clients/fetch.source.ts"],"sourcesContent":["// @ts-expect-error - import attributes are handled at build time by importAttributeTextPlugin\nimport content from '../../../templates/clients/fetch.ts' with { type: 'text' }\n\nexport const source = content as string\n"],"mappings":";;AAAA,MAAa,SAAS"}
+{"version":3,"file":"fetch.source.cjs","names":[],"sources":[],"mappings":""}

package/dist/templates/clients/fetch.source.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.source.js","names":[],"sources":["../../../src/templates/clients/fetch.source.ts"],"sourcesContent":["// @ts-expect-error - import attributes are handled at build time by importAttributeTextPlugin\nimport content from '../../../templates/clients/fetch.ts' with { type: 'text' }\n\nexport const source = content as string\n"],"mappings":";AAAA,MAAa,SAAS"}
+{"version":3,"file":"fetch.source.js","names":[],"sources":[],"mappings":""}

package/dist/templates/config.source.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"config.source.cjs","names":[],"sources":["../../src/templates/config.source.ts"],"sourcesContent":["// @ts-expect-error - import attributes are handled at build time by importAttributeTextPlugin\nimport content from '../../templates/config.ts' with { type: 'text' }\n\nexport const source = content as string\n"],"mappings":";;AAAA,MAAa,SAAS"}
+{"version":3,"file":"config.source.cjs","names":[],"sources":[],"mappings":""}

package/dist/templates/config.source.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.source.js","names":[],"sources":["../../src/templates/config.source.ts"],"sourcesContent":["// @ts-expect-error - import attributes are handled at build time by importAttributeTextPlugin\nimport content from '../../templates/config.ts' with { type: 'text' }\n\nexport const source = content as string\n"],"mappings":";AAAA,MAAa,SAAS"}
+{"version":3,"file":"config.source.js","names":[],"sources":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-client",
-  "version": "5.0.0-beta.42",
+  "version": "5.0.0-beta.56",
   "description": "Generate type-safe HTTP clients from your OpenAPI specification. Supports Axios, Fetch, and custom client adapters with full TypeScript inference and zero boilerplate.",
   "keywords": [
     "api-client",
@@ -24,7 +24,6 @@
   "files": [
     "src",
     "dist",
-    "extension.yaml",
     "*.d.ts",
     "*.d.cts",
     "!/**/**.test.**",
@@ -87,18 +86,19 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@kubb/core": "5.0.0-beta.42",
-    "@kubb/renderer-jsx": "5.0.0-beta.42",
-    "@kubb/plugin-ts": "5.0.0-beta.42",
-    "@kubb/plugin-zod": "5.0.0-beta.42"
+    "@kubb/ast": "5.0.0-beta.55",
+    "@kubb/core": "5.0.0-beta.55",
+    "@kubb/renderer-jsx": "5.0.0-beta.55",
+    "@kubb/plugin-ts": "5.0.0-beta.56",
+    "@kubb/plugin-zod": "5.0.0-beta.56"
   },
   "devDependencies": {
-    "axios": "^1.16.1",
+    "axios": "^1.17.0",
     "@internals/shared": "0.0.0",
     "@internals/utils": "0.0.0"
   },
   "peerDependencies": {
-    "@kubb/renderer-jsx": "5.0.0-beta.42",
+    "@kubb/renderer-jsx": "5.0.0-beta.55",
     "axios": "^1.7.2"
   },
   "peerDependenciesMeta": {
@@ -106,19 +106,12 @@
       "optional": true
     }
   },
-  "size-limit": [
-    {
-      "path": "./dist/*.js",
-      "limit": "510 KiB",
-      "gzip": true
-    }
-  ],
   "engines": {
     "node": ">=22"
   },
   "scripts": {
-    "build": "tsdown && size-limit",
-    "clean": "npx rimraf ./dist",
+    "build": "tsdown",
+    "clean": "node -e \"require('node:fs').rmSync('./dist', {recursive:true,force:true})\"",
     "lint": "oxlint .",
     "lint:fix": "oxlint --fix .",
     "release": "pnpm publish --no-git-check",

package/src/components/ClassClient.tsx

@@ -1,5 +1,6 @@
 import { buildOperationComments, getContentTypeInfo, getOperationParameters } from '@internals/shared'
-import { buildJSDoc, URLPath } from '@internals/utils'
+import { Url } from '@internals/utils'
+import { buildJSDoc, stringify } from '@kubb/ast/utils'
 import { ast } from '@kubb/core'
 import type { ResolverTs } from '@kubb/plugin-ts'
 import { functionPrinter } from '@kubb/plugin-ts'
@@ -7,7 +8,16 @@ import type { ResolverZod } from '@kubb/plugin-zod'
 import { File } from '@kubb/renderer-jsx'
 import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { PluginClient } from '../types.ts'
-import { buildClassClientParams, buildFormDataLine, buildGenerics, buildHeaders, buildRequestDataLine, buildReturnStatement } from '../utils.ts'
+import {
+  buildClassClientParams,
+  buildFormDataLine,
+  buildGenerics,
+  buildHeaders,
+  buildQueryParamsLine,
+  buildRequestDataLine,
+  buildReturnStatement,
+  resolveQueryParamsParser,
+} from '../utils.ts'
 import { buildClientParamsNode } from './Client.tsx'
 
 type OperationData = {
@@ -59,26 +69,40 @@ function generateMethod({
   pathParamsType,
 }: GenerateMethodProps): string {
   if (!ast.isHttpOperationNode(node)) return ''
-  const path = new URLPath(node.path, { casing: paramsCasing })
   const { defaultContentType: contentType, isMultipleContentTypes, hasFormData } = getContentTypeInfo(node)
   const isFormData = !isMultipleContentTypes && contentType === 'multipart/form-data'
   const { header: headerParams } = getOperationParameters(node)
   const headerParamsName = headerParams.length > 0 ? tsResolver.resolveHeaderParamsName(node, headerParams[0]!) : null
   const headers = isMultipleContentTypes ? (headerParamsName ? ['...headers'] : []) : buildHeaders(contentType, !!headerParamsName)
-  const generics = buildGenerics(node, tsResolver)
+  const generics = buildGenerics(node, tsResolver, { dataReturnType, zodResolver, parser })
   const paramsNode = buildClientParamsNode({ paramsType, paramsCasing, pathParamsType, node, tsResolver, isConfigurable: true })
   const paramsSignature = declarationPrinter.print(paramsNode) ?? ''
-  const clientParams = buildClassClientParams({ node, path, baseURL, tsResolver, isFormData, isMultipleContentTypes, hasFormData, headers })
+  const { query: queryParams } = getOperationParameters(node)
+  const zodQueryParamsName =
+    zodResolver && resolveQueryParamsParser(parser) === 'zod' && queryParams.length > 0 ? zodResolver.resolveQueryParamsName?.(node, queryParams[0]!) : null
+  const clientParams = buildClassClientParams({
+    node,
+    url: Url.toTemplateString(node.path, { casing: paramsCasing }),
+    baseURL,
+    tsResolver,
+    isFormData,
+    isMultipleContentTypes,
+    hasFormData,
+    headers,
+    zodQueryParamsName,
+  })
   const jsdoc = buildJSDoc(buildOperationComments(node, { link: 'urlPath', linkPosition: 'beforeDeprecated', splitLines: true }))
 
   const requestDataLine = buildRequestDataLine({ parser, node, zodResolver })
+  const queryParamsLine = buildQueryParamsLine({ parser, node, zodResolver })
   const formDataLine = buildFormDataLine(isFormData || (isMultipleContentTypes && hasFormData), !!node.requestBody?.content?.[0]?.schema)
-  const returnStatement = buildReturnStatement({ dataReturnType, parser, node, zodResolver })
+  const returnStatement = buildReturnStatement({ dataReturnType, parser, node, zodResolver, tsResolver })
 
   const methodBody = [
-    `const { client: request = client, ${isMultipleContentTypes ? `contentType = ${JSON.stringify(contentType)}, ` : ''}...requestConfig } = mergeConfig(this.#config, config)`,
+    `const { client: request = client, ${isMultipleContentTypes ? `contentType = ${stringify(contentType)}, ` : ''}...requestConfig } = mergeConfig(this.#config, config)`,
     '',
     requestDataLine,
+    queryParamsLine,
     formDataLine,
     `const res = await request<${generics.join(', ')}>(${clientParams.toCall()})`,
     returnStatement,

package/src/components/Client.tsx

@@ -7,7 +7,8 @@ import {
   getResponseType,
   resolveSuccessNames,
 } from '@internals/shared'
-import { isValidVarName, URLPath } from '@internals/utils'
+import { isValidVarName, Url } from '@internals/utils'
+import { stringify } from '@kubb/ast/utils'
 import { ast } from '@kubb/core'
 import type { ResolverTs } from '@kubb/plugin-ts'
 import { functionPrinter } from '@kubb/plugin-ts'
@@ -16,6 +17,7 @@ import { File, Function } from '@kubb/renderer-jsx'
 import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import { createFunctionParams } from '../functionParams.ts'
 import type { PluginClient } from '../types.ts'
+import { buildStatusUnionType, resolveQueryParamsParser, resolveRequestParser, resolveResponseParser } from '../utils.ts'
 import { buildUrlParamsNode } from './Url.tsx'
 
 type Props = {
@@ -98,7 +100,6 @@ export function Client({
   isConfigurable = true,
 }: Props): KubbReactNode {
   if (!ast.isHttpOperationNode(node)) return null
-  const path = new URLPath(node.path)
   const { defaultContentType: contentType, isMultipleContentTypes, hasFormData } = getContentTypeInfo(node)
   const isFormData = !isMultipleContentTypes && contentType === 'multipart/form-data'
   const responseType = getResponseType(node)
@@ -116,8 +117,13 @@ export function Client({
   const queryParamsName = originalQueryParams.length > 0 ? tsResolver.resolveQueryParamsName(node, originalQueryParams[0]!) : null
   const headerParamsName = originalHeaderParams.length > 0 ? tsResolver.resolveHeaderParamsName(node, originalHeaderParams[0]!) : null
 
-  const zodResponseName = zodResolver && parser === 'zod' ? zodResolver.resolveResponseName?.(node) : null
-  const zodRequestName = zodResolver && parser === 'zod' && node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : null
+  const requestParser = resolveRequestParser(parser)
+  const responseParser = resolveResponseParser(parser)
+  const zodResponseName = zodResolver && responseParser === 'zod' ? zodResolver.resolveResponseName?.(node) : null
+  const zodRequestName = zodResolver && requestParser === 'zod' && node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : null
+  const queryParamsParser = resolveQueryParamsParser(parser)
+  const zodQueryParamsName =
+    zodResolver && queryParamsParser === 'zod' && originalQueryParams.length > 0 ? zodResolver.resolveQueryParamsName?.(node, originalQueryParams[0]!) : null
 
   const errorNames = node.responses
     .filter((r) => {
@@ -133,7 +139,11 @@ export function Client({
 
   const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(' | ') : 'Error'}>`
 
-  const generics = [responseName, TError, requestName || 'unknown'].filter(Boolean)
+  const allStatusNames = node.responses.map((r) => tsResolver.resolveResponseStatusName(node, r.statusCode))
+  const genericsResponseName = dataReturnType === 'full' ? (allStatusNames.length > 0 ? allStatusNames.join(' | ') : responseName) : responseName
+  // z.output<> reflects the post-transform type (e.g. date coercion turns Date → string), avoiding a compile error on the generated call
+  const requestGenericType = parser === 'zod' && zodRequestName ? `z.output<typeof ${zodRequestName}>` : requestName || 'unknown'
+  const generics = [genericsResponseName, TError, requestGenericType].filter(Boolean)
   const paramsNode = buildClientParamsNode({
     paramsType,
     paramsCasing,
@@ -159,10 +169,10 @@ export function Client({
       mode: 'object',
       children: {
         method: {
-          value: JSON.stringify(node.method.toUpperCase()),
+          value: stringify(node.method.toUpperCase()),
         },
         url: {
-          value: urlName ? `${urlName}(${urlParamsCall}).url.toString()` : path.template,
+          value: urlName ? `${urlName}(${urlParamsCall}).url.toString()` : Url.toTemplateString(node.path),
         },
         baseURL:
           baseURL && !urlName
@@ -170,7 +180,7 @@ export function Client({
                 value: `\`${baseURL}\``,
               }
             : null,
-        params: queryParamsName ? (queryParamsMapping ? { value: 'mappedParams' } : {}) : null,
+        params: queryParamsName ? (zodQueryParamsName ? { value: 'requestParams' } : queryParamsMapping ? { value: 'mappedParams' } : {}) : null,
         data: requestName
           ? {
               value:
@@ -182,7 +192,7 @@ export function Client({
             }
           : null,
         contentType: isConfigurable && isMultipleContentTypes ? {} : null,
-        responseType: responseType ? { value: JSON.stringify(responseType) } : null,
+        responseType: responseType ? { value: stringify(responseType) } : null,
         requestConfig: isConfigurable
           ? {
               mode: 'inlineSpread',
@@ -197,14 +207,20 @@ export function Client({
     },
   })
 
+  const statusUnionType = dataReturnType === 'full' ? buildStatusUnionType(node, tsResolver) : null
+
   const childrenElement = children ? (
     children
   ) : (
     <>
-      {dataReturnType === 'full' && parser === 'zod' && zodResponseName && `return {...res, data: ${zodResponseName}.parse(res.data)}`}
-      {dataReturnType === 'data' && parser === 'zod' && zodResponseName && `return ${zodResponseName}.parse(res.data)`}
-      {dataReturnType === 'full' && parser !== 'zod' && 'return res'}
-      {dataReturnType === 'data' && parser !== 'zod' && 'return res.data'}
+      {dataReturnType === 'full' &&
+        responseParser === 'zod' &&
+        zodResponseName &&
+        statusUnionType &&
+        `return {...res, data: ${zodResponseName}.parse(res.data)} as ${statusUnionType}`}
+      {dataReturnType === 'full' && responseParser !== 'zod' && statusUnionType && `return res as ${statusUnionType}`}
+      {dataReturnType === 'data' && responseParser === 'zod' && zodResponseName && `return ${zodResponseName}.parse(res.data)`}
+      {dataReturnType === 'data' && responseParser !== 'zod' && 'return res.data'}
     </>
   )
 
@@ -224,28 +240,21 @@ export function Client({
           returnType={returnType}
         >
           {isConfigurable
-            ? `const { client: request = client, ${isMultipleContentTypes ? `contentType = ${JSON.stringify(contentType)}, ` : ''}...requestConfig } = config`
+            ? `const { client: request = client, ${isMultipleContentTypes ? `contentType = ${stringify(contentType)}, ` : ''}...requestConfig } = config`
             : ''}
           <br />
-          <br />
           {pathParamsMapping &&
             Object.entries(pathParamsMapping)
               .filter(([originalName, camelCaseName]) => isValidVarName(originalName) && originalName !== camelCaseName)
               .map(([originalName, camelCaseName]) => `const ${originalName} = ${camelCaseName}`)
               .join('\n')}
-          {pathParamsMapping && (
-            <>
-              <br />
-              <br />
-            </>
-          )}
+          {pathParamsMapping && <br />}
           {queryParamsMapping && queryParamsName && (
             <>
               {`const mappedParams = params ? { ${Object.entries(queryParamsMapping)
                 .map(([originalName, camelCaseName]) => `"${originalName}": params.${camelCaseName}`)
                 .join(', ')} } : undefined`}
               <br />
-              <br />
             </>
           )}
           {headerParamsMapping && headerParamsName && (
@@ -254,11 +263,10 @@ export function Client({
                 .map(([originalName, camelCaseName]) => `"${originalName}": headers.${camelCaseName}`)
                 .join(', ')} } : undefined`}
               <br />
-              <br />
             </>
           )}
-          {parser === 'zod' && zodRequestName ? `const requestData = ${zodRequestName}.parse(data)` : requestName && 'const requestData = data'}
-          <br />
+          {requestParser === 'zod' && zodRequestName ? `const requestData = ${zodRequestName}.parse(data)` : requestName && 'const requestData = data'}
+          {zodQueryParamsName && `const requestParams = ${zodQueryParamsName}.parse(params)`}
           {(isFormData || (isMultipleContentTypes && hasFormData)) && requestName && 'const formData = buildFormData(requestData)'}
           <br />
           {isConfigurable

package/src/components/StaticClassClient.tsx

@@ -1,5 +1,6 @@
 import { buildOperationComments, getContentTypeInfo, getOperationParameters } from '@internals/shared'
-import { buildJSDoc, URLPath } from '@internals/utils'
+import { Url } from '@internals/utils'
+import { buildJSDoc, stringify } from '@kubb/ast/utils'
 import { ast } from '@kubb/core'
 import type { ResolverTs } from '@kubb/plugin-ts'
 import { functionPrinter } from '@kubb/plugin-ts'
@@ -7,7 +8,16 @@ import type { ResolverZod } from '@kubb/plugin-zod'
 import { File } from '@kubb/renderer-jsx'
 import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { PluginClient } from '../types.ts'
-import { buildClassClientParams, buildFormDataLine, buildGenerics, buildHeaders, buildRequestDataLine, buildReturnStatement } from '../utils.ts'
+import {
+  buildClassClientParams,
+  buildFormDataLine,
+  buildGenerics,
+  buildHeaders,
+  buildQueryParamsLine,
+  buildRequestDataLine,
+  buildReturnStatement,
+  resolveQueryParamsParser,
+} from '../utils.ts'
 import { buildClientParamsNode } from './Client.tsx'
 
 type OperationData = {
@@ -59,26 +69,40 @@ function generateMethod({
   pathParamsType,
 }: GenerateMethodProps): string {
   if (!ast.isHttpOperationNode(node)) return ''
-  const path = new URLPath(node.path, { casing: paramsCasing })
   const { defaultContentType: contentType, isMultipleContentTypes, hasFormData } = getContentTypeInfo(node)
   const isFormData = !isMultipleContentTypes && contentType === 'multipart/form-data'
   const { header: headerParams } = getOperationParameters(node)
   const headerParamsName = headerParams.length > 0 ? tsResolver.resolveHeaderParamsName(node, headerParams[0]!) : null
   const headers = isMultipleContentTypes ? (headerParamsName ? ['...headers'] : []) : buildHeaders(contentType, !!headerParamsName)
-  const generics = buildGenerics(node, tsResolver)
+  const generics = buildGenerics(node, tsResolver, { dataReturnType, zodResolver, parser })
   const paramsNode = buildClientParamsNode({ paramsType, paramsCasing, pathParamsType, node, tsResolver, isConfigurable: true })
   const paramsSignature = declarationPrinter.print(paramsNode) ?? ''
-  const clientParams = buildClassClientParams({ node, path, baseURL, tsResolver, isFormData, isMultipleContentTypes, hasFormData, headers })
+  const { query: queryParams } = getOperationParameters(node)
+  const zodQueryParamsName =
+    zodResolver && resolveQueryParamsParser(parser) === 'zod' && queryParams.length > 0 ? zodResolver.resolveQueryParamsName?.(node, queryParams[0]!) : null
+  const clientParams = buildClassClientParams({
+    node,
+    url: Url.toTemplateString(node.path, { casing: paramsCasing }),
+    baseURL,
+    tsResolver,
+    isFormData,
+    isMultipleContentTypes,
+    hasFormData,
+    headers,
+    zodQueryParamsName,
+  })
   const jsdoc = buildJSDoc(buildOperationComments(node, { link: 'urlPath', linkPosition: 'beforeDeprecated', splitLines: true }))
 
   const requestDataLine = buildRequestDataLine({ parser, node, zodResolver })
+  const queryParamsLine = buildQueryParamsLine({ parser, node, zodResolver })
   const formDataLine = buildFormDataLine(isFormData || (isMultipleContentTypes && hasFormData), !!node.requestBody?.content?.[0]?.schema)
-  const returnStatement = buildReturnStatement({ dataReturnType, parser, node, zodResolver })
+  const returnStatement = buildReturnStatement({ dataReturnType, parser, node, zodResolver, tsResolver })
 
   const methodBody = [
-    `const { client: request = client, ${isMultipleContentTypes ? `contentType = ${JSON.stringify(contentType)}, ` : ''}...requestConfig } = mergeConfig(this.#config, config)`,
+    `const { client: request = client, ${isMultipleContentTypes ? `contentType = ${stringify(contentType)}, ` : ''}...requestConfig } = mergeConfig(this.#config, config)`,
     '',
     requestDataLine,
+    queryParamsLine,
     formDataLine,
     `const res = await request<${generics.join(', ')}>(${clientParams.toCall()})`,
     returnStatement,

package/src/components/Url.tsx

@@ -1,5 +1,5 @@
 import { buildParamsMapping, getOperationParameters } from '@internals/shared'
-import { isValidVarName, URLPath } from '@internals/utils'
+import { isValidVarName, Url as UrlHelper } from '@internals/utils'
 import { ast } from '@kubb/core'
 import type { ResolverTs } from '@kubb/plugin-ts'
 import { functionPrinter } from '@kubb/plugin-ts'
@@ -58,7 +58,6 @@ export function Url({
   tsResolver,
 }: Props): KubbReactNode {
   if (!ast.isHttpOperationNode(node)) return null
-  const path = new URLPath(node.path)
 
   const paramsNode = buildUrlParamsNode({
     paramsType,
@@ -82,7 +81,7 @@ export function Url({
             .map(([originalName, camelCaseName]) => `const ${originalName} = ${camelCaseName}`)
             .join('\n')}
         {pathParamsMapping && Object.keys(pathParamsMapping).length > 0 && <br />}
-        <Const name={'res'}>{`{ method: '${node.method.toUpperCase()}', url: ${path.toTemplateString({ prefix: baseURL })} as const }`}</Const>
+        <Const name={'res'}>{`{ method: '${node.method.toUpperCase()}', url: ${UrlHelper.toTemplateString(node.path, { prefix: baseURL })} as const }`}</Const>
         <br />
         return res
       </Function>

package/src/generators/classClientGenerator.tsx

@@ -1,15 +1,16 @@
 import path from 'node:path'
-import { operationFileEntry, resolveOperationTypeNames } from '@internals/shared'
+import { getOperationParameters, operationFileEntry, resolveOperationTypeNames } from '@internals/shared'
 import { camelCase } from '@internals/utils'
 import { ast, defineGenerator } from '@kubb/core'
 import type { ResolverTs } from '@kubb/plugin-ts'
 import { pluginTsName } from '@kubb/plugin-ts'
 import type { ResolverZod } from '@kubb/plugin-zod'
 import { pluginZodName } from '@kubb/plugin-zod'
-import { File, jsxRendererSync } from '@kubb/renderer-jsx'
+import { File, jsxRenderer } from '@kubb/renderer-jsx'
 import { ClassClient } from '../components/ClassClient'
 import { WrapperClient } from '../components/WrapperClient'
 import type { PluginClient } from '../types'
+import { isParserEnabled, resolveQueryParamsParser, resolveRequestParser, resolveResponseParser } from '../utils.ts'
 
 type OperationData = {
   node: ast.OperationNode
@@ -31,10 +32,12 @@ function resolveTypeImportNames(node: ast.OperationNode, tsResolver: ResolverTs)
   return resolveOperationTypeNames(node, tsResolver, { order: 'body-response-first' })
 }
 
-function resolveZodImportNames(node: ast.OperationNode, zodResolver: ResolverZod): Array<string> {
+function resolveZodImportNames(node: ast.OperationNode, zodResolver: ResolverZod, parser: PluginClient['resolvedOptions']['parser']): Array<string> {
+  const { query: queryParams } = getOperationParameters(node)
   const names: Array<string | null | undefined> = [
-    zodResolver.resolveResponseName?.(node),
-    node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : null,
+    resolveResponseParser(parser) === 'zod' ? zodResolver.resolveResponseName?.(node) : null,
+    resolveRequestParser(parser) === 'zod' && node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : null,
+    resolveQueryParamsParser(parser) === 'zod' && queryParams.length > 0 ? zodResolver.resolveQueryParamsName?.(node, queryParams[0]!) : null,
   ]
   return names.filter((n): n is string => Boolean(n))
 }
@@ -46,7 +49,7 @@ function resolveZodImportNames(node: ast.OperationNode, zodResolver: ResolverZod
  */
 export const classClientGenerator = defineGenerator<PluginClient>({
   name: 'classClient',
-  renderer: jsxRendererSync,
+  renderer: jsxRenderer,
   operations(nodes, ctx) {
     const { config, driver, resolver, root } = ctx
     const { output, group, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath, sdk } = ctx.options
@@ -57,7 +60,7 @@ export const classClientGenerator = defineGenerator<PluginClient>({
 
     const tsResolver = driver.getResolver(pluginTsName)
     const tsPluginOptions = pluginTs.options
-    const pluginZod = parser === 'zod' ? driver.getPlugin(pluginZodName) : null
+    const pluginZod = isParserEnabled(parser) ? driver.getPlugin(pluginZodName) : null
     const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null
 
     function buildOperationData(node: ast.OperationNode): OperationData {
@@ -88,7 +91,7 @@ export const classClientGenerator = defineGenerator<PluginClient>({
     const controllers = nodes.reduce((acc, operationNode) => {
       if (!ast.isHttpOperationNode(operationNode)) return acc
       const tag = operationNode.tags[0]
-      const groupName = tag ? (group?.name?.({ group: camelCase(tag) }) ?? resolver.resolveGroupName(tag)) : resolver.resolveGroupName('Client')
+      const groupName = tag ? (group?.name?.({ group: camelCase(tag) }) ?? resolver.resolveGroupName(tag)) : resolver.resolveClassName('Client')
 
       if (!tag && !group) {
         const name = resolver.resolveClassName('ApiClient')
@@ -145,7 +148,7 @@ export const classClientGenerator = defineGenerator<PluginClient>({
 
       ops.forEach((op) => {
         if (!op.zodFile || !zodResolver) return
-        const names = resolveZodImportNames(op.node, zodResolver)
+        const names = resolveZodImportNames(op.node, zodResolver, parser)
         if (!zodImportsByFile.has(op.zodFile.path)) {
           zodImportsByFile.set(op.zodFile.path, new Set())
         }
@@ -161,8 +164,9 @@ export const classClientGenerator = defineGenerator<PluginClient>({
 
     const files = controllers.map(({ name, file, operations: ops }) => {
       const { typeImportsByFile, typeFilesByPath } = collectTypeImports(ops)
-      const { zodImportsByFile, zodFilesByPath } =
-        parser === 'zod' ? collectZodImports(ops) : { zodImportsByFile: new Map<string, Set<string>>(), zodFilesByPath: new Map<string, ast.FileNode>() }
+      const { zodImportsByFile, zodFilesByPath } = isParserEnabled(parser)
+        ? collectZodImports(ops)
+        : { zodImportsByFile: new Map<string, Set<string>>(), zodFilesByPath: new Map<string, ast.FileNode>() }
       const hasFormData = ops.some((op) => op.node.requestBody?.content?.some((e) => e.contentType === 'multipart/form-data') ?? false)
 
       return (
@@ -190,6 +194,10 @@ export const classClientGenerator = defineGenerator<PluginClient>({
 
           {hasFormData && <File.Import name={['buildFormData']} root={file.path} path={path.resolve(root, '.kubb/config.ts')} />}
 
+          {parser === 'zod' && zodResolver && ops.some((op) => op.node.requestBody?.content?.[0]?.schema != null) && (
+            <File.Import name={['z']} path="zod" isTypeOnly />
+          )}
+
           {Array.from(typeImportsByFile.entries()).map(([filePath, importSet]) => {
             const typeFile = typeFilesByPath.get(filePath)
             if (!typeFile) return null
@@ -198,7 +206,7 @@ export const classClientGenerator = defineGenerator<PluginClient>({
             return <File.Import key={filePath} name={importNames} root={file.path} path={typeFile.path} isTypeOnly />
           })}
 
-          {parser === 'zod' &&
+          {isParserEnabled(parser) &&
             Array.from(zodImportsByFile.entries()).map(([filePath, importSet]) => {
               const zodFile = zodFilesByPath.get(filePath)
               if (!zodFile) return null

package/src/generators/clientGenerator.tsx

@@ -1,12 +1,13 @@
 import path from 'node:path'
-import { operationFileEntry, resolveOperationTypeNames } from '@internals/shared'
+import { getOperationParameters, operationFileEntry, resolveOperationTypeNames } from '@internals/shared'
 import { ast, defineGenerator } from '@kubb/core'
 import { pluginTsName } from '@kubb/plugin-ts'
 import { pluginZodName } from '@kubb/plugin-zod'
-import { File, jsxRendererSync } from '@kubb/renderer-jsx'
+import { File, jsxRenderer } from '@kubb/renderer-jsx'
 import { Client } from '../components/Client'
 import { Url } from '../components/Url.tsx'
 import type { PluginClient } from '../types'
+import { isParserEnabled, resolveQueryParamsParser, resolveRequestParser, resolveResponseParser } from '../utils.ts'
 
 /**
  * Built-in operation generator for `@kubb/plugin-client`. Emits one async
@@ -15,7 +16,7 @@ import type { PluginClient } from '../types'
  */
 export const clientGenerator = defineGenerator<PluginClient>({
   name: 'client',
-  renderer: jsxRendererSync,
+  renderer: jsxRenderer,
   operation(node, ctx) {
     if (!ast.isHttpOperationNode(node)) return null
     const { config, driver, resolver, root } = ctx
@@ -30,17 +31,22 @@ export const clientGenerator = defineGenerator<PluginClient>({
 
     const tsResolver = driver.getResolver(pluginTsName)
 
-    const pluginZod = parser === 'zod' ? driver.getPlugin(pluginZodName) : null
+    const pluginZod = isParserEnabled(parser) ? driver.getPlugin(pluginZodName) : null
     const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null
 
     const importedTypeNames = resolveOperationTypeNames(node, tsResolver, { paramsCasing })
 
-    const importedZodNames =
-      zodResolver && parser === 'zod'
-        ? [zodResolver.resolveResponseName?.(node), node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : null].filter(
-            (name): name is string => Boolean(name),
-          )
-        : []
+    const { query: queryParams } = getOperationParameters(node)
+
+    const importedZodNames = zodResolver
+      ? [
+          resolveResponseParser(parser) === 'zod' ? zodResolver.resolveResponseName?.(node) : null,
+          resolveRequestParser(parser) === 'zod' && node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : null,
+          resolveQueryParamsParser(parser) === 'zod' && queryParams.length > 0 ? zodResolver.resolveQueryParamsName?.(node, queryParams[0]!) : null,
+        ].filter((name): name is string => Boolean(name))
+      : []
+
+    const zodRequestName = zodResolver && parser === 'zod' && node.requestBody?.content?.[0]?.schema ? (zodResolver.resolveDataName?.(node) ?? null) : null
 
     const meta = {
       name: resolver.resolveName(node.operationId),
@@ -90,6 +96,8 @@ export const clientGenerator = defineGenerator<PluginClient>({
 
         {hasFormData && <File.Import name={['buildFormData']} root={meta.file.path} path={path.resolve(root, '.kubb/config.ts')} />}
 
+        {zodRequestName && <File.Import name={['z']} path="zod" isTypeOnly />}
+
         {meta.fileZod && importedZodNames.length > 0 && <File.Import name={importedZodNames as Array<string>} root={meta.file.path} path={meta.fileZod.path} />}
 
         {meta.fileTs && importedTypeNames.length > 0 && (

package/src/generators/groupedClientGenerator.tsx

@@ -1,7 +1,7 @@
 import { camelCase } from '@internals/utils'
 import type { ast } from '@kubb/core'
 import { defineGenerator } from '@kubb/core'
-import { File, Function, jsxRendererSync } from '@kubb/renderer-jsx'
+import { File, Function, jsxRenderer } from '@kubb/renderer-jsx'
 import type { PluginClient } from '../types'
 
 /**
@@ -12,7 +12,7 @@ import type { PluginClient } from '../types'
  */
 export const groupedClientGenerator = defineGenerator<PluginClient>({
   name: 'groupedClient',
-  renderer: jsxRendererSync,
+  renderer: jsxRenderer,
   operations(nodes, ctx) {
     const { config, resolver, root } = ctx
     const { output, group } = ctx.options