@kubb/plugin-fetch 5.0.0-beta.76 → 5.0.0-beta.79

package/src/generators/clientGenerator.tsx

@@ -1,6 +1,13 @@
 import path from 'node:path'
-import { buildZodErrorParse, getOperationSecurity, Operation, resolveRequestParser, resolveResponseParser, type SecurityDocument } from '@internals/client'
-import { operationFileEntry } from '@internals/shared'
+import {
+  buildZodErrorParse,
+  getOperationSecurity,
+  Operation,
+  resolveRequestValidator,
+  resolveResponseValidator,
+  type SecurityDocument,
+} from '@internals/client'
+import { isEventStream, operationFileEntry } from '@internals/shared'
 import { ast, defineGenerator } from '@kubb/core'
 import { pluginTsName } from '@kubb/plugin-ts'
 import { pluginZodName } from '@kubb/plugin-zod'
@@ -19,15 +26,15 @@ export const clientGenerator = defineGenerator<PluginFetch>({
     if (!ast.isHttpOperationNode(node)) return null
 
     const { config, driver, resolver, root } = ctx
-    const { output, parser, group } = ctx.options
+    const { output, validator, group } = ctx.options
 
     const pluginTs = driver.getPlugin(pluginTsName)
     if (!pluginTs) return null
 
     const tsResolver = driver.getResolver(pluginTsName)
 
-    const parserEnabled = resolveResponseParser(parser) === 'zod' || resolveRequestParser(parser) === 'zod'
-    const pluginZod = parserEnabled ? driver.getPlugin(pluginZodName) : null
+    const validatorEnabled = resolveResponseValidator(validator) === 'zod' || resolveRequestValidator(validator) === 'zod'
+    const pluginZod = validatorEnabled ? driver.getPlugin(pluginZodName) : null
     const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null
 
     const hasRequestBody = Boolean(node.requestBody?.content?.[0]?.schema)
@@ -35,9 +42,9 @@ export const clientGenerator = defineGenerator<PluginFetch>({
 
     const importedZodNames = zodResolver
       ? [
-          resolveResponseParser(parser) === 'zod' ? zodResolver.resolveResponseName?.(node) : null,
-          resolveResponseParser(parser) === 'zod' ? (buildZodErrorParse(node, zodResolver)?.expression ?? null) : null,
-          resolveRequestParser(parser) === 'zod' && hasRequestBody ? zodResolver.resolveDataName?.(node) : null,
+          resolveResponseValidator(validator) === 'zod' ? zodResolver.resolveResponseName?.(node) : null,
+          resolveResponseValidator(validator) === 'zod' ? (buildZodErrorParse(node, zodResolver)?.expression ?? null) : null,
+          resolveRequestValidator(validator) === 'zod' && hasRequestBody ? zodResolver.resolveDataName?.(node) : null,
         ].filter((name): name is string => Boolean(name))
       : []
 
@@ -66,6 +73,7 @@ export const clientGenerator = defineGenerator<PluginFetch>({
     })
 
     const clientPath = path.resolve(root, '.kubb/client.ts')
+    const eventStream = isEventStream(node)
 
     return (
       <File
@@ -75,8 +83,13 @@ export const clientGenerator = defineGenerator<PluginFetch>({
         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 } })}
       >
-        <File.Import name={['client']} root={meta.file.path} path={clientPath} />
-        <File.Import name={['Options', 'RequestResult']} root={meta.file.path} path={clientPath} isTypeOnly />
+        <File.Import name={eventStream ? ['client', 'toEventStream'] : ['client']} root={meta.file.path} path={clientPath} />
+        <File.Import
+          name={eventStream ? ['Options', 'EventStreamResult', 'SuccessOf'] : ['Options', 'RequestResult']}
+          root={meta.file.path}
+          path={clientPath}
+          isTypeOnly
+        />
 
         {meta.fileTs && importedTypeNames.length > 0 && (
           <File.Import name={Array.from(new Set(importedTypeNames))} root={meta.file.path} path={meta.fileTs.path} isTypeOnly />
@@ -84,7 +97,7 @@ export const clientGenerator = defineGenerator<PluginFetch>({
 
         {meta.fileZod && importedZodNames.length > 0 && <File.Import name={importedZodNames} root={meta.file.path} path={meta.fileZod.path} />}
 
-        <Operation name={meta.name} node={node} tsResolver={tsResolver} zodResolver={zodResolver} parser={parser} security={security} />
+        <Operation name={meta.name} node={node} tsResolver={tsResolver} zodResolver={zodResolver} validator={validator} security={security} />
       </File>
     )
   },

package/src/plugin.ts

@@ -1,11 +1,11 @@
 import path from 'node:path'
-import { createSdkGenerator, defaultMacros, isParserEnabled, resolverClient } from '@internals/client'
+import { createSdkGenerator, defaultMacros, isValidatorEnabled, resolverClient } from '@internals/client'
 import { createGroupConfig } from '@internals/shared'
 import { definePlugin } from '@kubb/core'
 import { pluginTsName } from '@kubb/plugin-ts'
 import { pluginZodName } from '@kubb/plugin-zod'
 import { clientGenerator } from './generators/clientGenerator.tsx'
-import { fetchClientTemplatePath } from './templates.ts'
+import { fetchClientTemplatePath, fetchSerializersTemplatePath, standardSchemaTemplatePath } from './templates.ts'
 import type { PluginFetch, ResolvedOptions } from './types.ts'
 
 /**
@@ -43,7 +43,7 @@ export const pluginFetch = definePlugin<PluginFetch>((options) => {
     include,
     override = [],
     baseURL,
-    parser = false,
+    validator = false,
     group,
     sdk,
     resolver: userResolver,
@@ -56,7 +56,7 @@ export const pluginFetch = definePlugin<PluginFetch>((options) => {
     override,
     group: createGroupConfig(group),
     baseURL,
-    parser,
+    validator,
     sdk: sdk ? { mode: sdk.mode ?? 'tag', name: sdk.name } : undefined,
     resolver: userResolver ? { ...resolverClient, ...userResolver } : resolverClient,
   }
@@ -68,7 +68,9 @@ export const pluginFetch = definePlugin<PluginFetch>((options) => {
   return {
     name: pluginFetchName,
     options,
-    dependencies: [pluginTsName, isParserEnabled(resolved.parser) ? pluginZodName : null].filter((dependency): dependency is string => Boolean(dependency)),
+    dependencies: [pluginTsName, isValidatorEnabled(resolved.validator) ? pluginZodName : null].filter((dependency): dependency is string =>
+      Boolean(dependency),
+    ),
     hooks: {
       'kubb:plugin:setup'(ctx) {
         ctx.setOptions(resolved)
@@ -79,12 +81,24 @@ export const pluginFetch = definePlugin<PluginFetch>((options) => {
 
         const root = path.resolve(ctx.config.root, ctx.config.output.path)
 
+        ctx.injectFile({
+          baseName: 'serializers.ts',
+          path: path.resolve(root, '.kubb/serializers.ts'),
+          copy: fetchSerializersTemplatePath,
+        })
+
         ctx.injectFile({
           baseName: 'client.ts',
           path: path.resolve(root, '.kubb/client.ts'),
           copy: fetchClientTemplatePath,
           footer: baseURL ? `client.setConfig({ baseURL: ${JSON.stringify(baseURL)} })` : undefined,
         })
+
+        ctx.injectFile({
+          baseName: 'standardSchema.ts',
+          path: path.resolve(root, '.kubb/standardSchema.ts'),
+          copy: standardSchemaTemplatePath,
+        })
       },
     },
   }

package/src/templates.ts

@@ -1,8 +1,13 @@
 import { fileURLToPath } from 'node:url'
 
+/** Absolute path to the fetch client template, copied into `.kubb/client.ts`. */
+export const fetchClientTemplatePath = fileURLToPath(new URL('../templates/fetch.ts', import.meta.url))
+
+/** Absolute path to the fetch serializers template, copied into `.kubb/serializers.ts`. */
+export const fetchSerializersTemplatePath = fileURLToPath(new URL('../templates/serializers.ts', import.meta.url))
+
 /**
- * Absolute path to the fetch client runtime template, resolved relative to this package's own
- * location so it stays correct no matter which package imports it. Pass it to a file node's `copy`
- * field to emit the runtime into the generated `.kubb/client.ts` verbatim.
+ * Absolute path to the Standard Schema runtime template. Pass it to a file node's `copy` field to
+ * emit the helper into the generated `.kubb/standardSchema.ts` verbatim.
  */
-export const fetchClientTemplatePath = fileURLToPath(new URL('../templates/fetch.ts', import.meta.url))
+export const standardSchemaTemplatePath = fileURLToPath(new URL('../templates/standardSchema.ts', import.meta.url))