@kubb/plugin-fetch 5.0.0-beta.85 → 5.0.0-beta.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-fetch",
-  "version": "5.0.0-beta.85",
+  "version": "5.0.0-beta.87",
   "description": "Generate a slim, type-safe HTTP client with Kubb based on the native Fetch api.",
   "keywords": [
     "api-client",
@@ -49,18 +49,17 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@kubb/plugin-ts": "5.0.0-beta.84",
-    "@kubb/plugin-zod": "5.0.0-beta.84"
+    "@kubb/plugin-ts": "5.0.0-beta.86",
+    "@kubb/plugin-zod": "5.0.0-beta.86"
   },
   "devDependencies": {
-    "kubb": "5.0.0-beta.84",
+    "kubb": "5.0.0-beta.89",
     "typescript": "^6.0.3",
     "@internals/client": "0.0.0",
-    "@internals/shared": "0.0.0",
-    "@internals/utils": "0.0.0"
+    "@internals/shared": "0.0.0"
   },
   "peerDependencies": {
-    "kubb": "5.0.0-beta.84"
+    "kubb": "5.0.0-beta.89"
   },
   "engines": {
     "node": ">=22"

package/src/generators/clientGenerator.tsx

@@ -38,27 +38,29 @@ export const clientGenerator = defineGenerator<PluginFetch>({
     const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null
 
     const hasRequestBody = Boolean(node.requestBody?.content?.[0]?.schema)
-    const importedTypeNames = [tsResolver.resolveRequestConfigName(node), tsResolver.resolveResponsesName(node)]
+    const importedTypeNames = [tsResolver.response.options(node), tsResolver.response.responses(node)]
 
     const importedZodNames = zodResolver
       ? [
-          resolveResponseValidator(validator) === 'zod' ? zodResolver.resolveResponseName?.(node) : null,
+          resolveResponseValidator(validator) === 'zod' ? zodResolver.response.response?.(node) : null,
           resolveResponseValidator(validator) === 'zod' ? (buildZodErrorParse(node, zodResolver)?.expression ?? null) : null,
-          resolveRequestValidator(validator) === 'zod' && hasRequestBody ? zodResolver.resolveDataName?.(node) : null,
+          resolveRequestValidator(validator) === 'zod' && hasRequestBody ? zodResolver.response.body?.(node) : null,
         ].filter((name): name is string => Boolean(name))
       : []
 
     const meta = {
-      name: resolver.resolveName(node.operationId),
-      file: resolver.resolveFile(operationFileEntry(node, node.operationId), { root, output, group: group ?? undefined }),
-      fileTs: tsResolver.resolveFile(operationFileEntry(node, node.operationId), {
+      name: resolver.name(node.operationId),
+      file: resolver.file({ ...operationFileEntry(node, node.operationId), root, output, group: group ?? undefined }),
+      fileTs: tsResolver.file({
+        ...operationFileEntry(node, node.operationId),
         root,
         output: pluginTs.options?.output ?? output,
         group: pluginTs.options?.group ?? undefined,
       }),
       fileZod:
         zodResolver && pluginZod?.options
-          ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
+          ? zodResolver.file({
+              ...operationFileEntry(node, node.operationId),
               root,
               output: pluginZod.options.output ?? output,
               group: pluginZod.options?.group ?? undefined,
@@ -80,8 +82,8 @@ export const clientGenerator = defineGenerator<PluginFetch>({
         baseName={meta.file.baseName}
         path={meta.file.path}
         meta={meta.file.meta}
-        banner={resolver.resolveBanner(ctx.meta, { output, config, file: { path: meta.file.path, baseName: meta.file.baseName } })}
-        footer={resolver.resolveFooter(ctx.meta, { output, config, file: { path: meta.file.path, baseName: meta.file.baseName } })}
+        banner={resolver.default.banner(ctx.meta, { output, config, file: { path: meta.file.path, baseName: meta.file.baseName } })}
+        footer={resolver.default.footer(ctx.meta, { output, config, file: { path: meta.file.path, baseName: meta.file.baseName } })}
       >
         <File.Import name={eventStream ? ['client', 'toEventStream'] : ['client']} root={meta.file.path} path={clientPath} />
         <File.Import

package/src/plugin.ts

@@ -1,12 +1,12 @@
 import path from 'node:path'
 import { createSdkGenerator, defaultMacros, isValidatorEnabled, resolverClient } from '@internals/client'
 import { createGroupConfig } from '@internals/shared'
-import { definePlugin } from 'kubb/kit'
+import { definePlugin, Resolver } from 'kubb/kit'
 import { pluginTsName } from '@kubb/plugin-ts'
 import { pluginZodName } from '@kubb/plugin-zod'
 import { clientGenerator } from './generators/clientGenerator.tsx'
 import { fetchClientTemplatePath, fetchSerializersTemplatePath, standardSchemaTemplatePath } from './templates.ts'
-import type { PluginFetch, ResolvedOptions } from './types.ts'
+import type { PluginFetch, ResolvedOptions, ResolverClient } from './types.ts'
 
 /**
  * Canonical plugin name for `@kubb/plugin-fetch`. Used for driver lookups and cross-plugin
@@ -58,7 +58,7 @@ export const pluginFetch = definePlugin<PluginFetch>((options) => {
     baseURL,
     validator,
     sdk: sdk ? { mode: sdk.mode ?? 'tag', name: sdk.name } : undefined,
-    resolver: userResolver ? { ...resolverClient, ...userResolver } : resolverClient,
+    resolver: userResolver ? Resolver.merge<ResolverClient>(resolverClient, userResolver) : resolverClient,
   }
 
   // `sdk` swaps the per-operation functions for the class-based SDK; left unset, the standalone