@kubb/plugin-fetch 5.0.0-beta.81 → 5.0.0-beta.84

package/package.json

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

package/src/generators/clientGenerator.tsx

@@ -8,10 +8,10 @@ import {
   type SecurityDocument,
 } from '@internals/client'
 import { isEventStream, operationFileEntry } from '@internals/shared'
-import { ast, defineGenerator } from '@kubb/core'
+import { ast, defineGenerator } from 'kubb/kit'
 import { pluginTsName } from '@kubb/plugin-ts'
 import { pluginZodName } from '@kubb/plugin-zod'
-import { File, jsxRenderer } from '@kubb/renderer-jsx'
+import { File, jsxRenderer } from 'kubb/jsx'
 import type { PluginFetch } from '../types.ts'
 
 /**

package/src/plugin.ts

@@ -1,7 +1,7 @@
 import path from 'node:path'
 import { createSdkGenerator, defaultMacros, isValidatorEnabled, resolverClient } from '@internals/client'
 import { createGroupConfig } from '@internals/shared'
-import { definePlugin } from '@kubb/core'
+import { definePlugin } from 'kubb/kit'
 import { pluginTsName } from '@kubb/plugin-ts'
 import { pluginZodName } from '@kubb/plugin-zod'
 import { clientGenerator } from './generators/clientGenerator.tsx'
@@ -22,7 +22,7 @@ export const pluginFetchName = 'plugin-fetch' satisfies PluginFetch['name']
  *
  * @example
  * ```ts
- * import { defineConfig } from 'kubb'
+ * import { defineConfig } from 'kubb/config'
  * import { pluginTs } from '@kubb/plugin-ts'
  * import { pluginFetch } from '@kubb/plugin-fetch'
  *

package/src/types.ts

@@ -1,4 +1,4 @@
-import type { PluginFactoryOptions } from '@kubb/core'
+import type { PluginFactoryOptions } from 'kubb/kit'
 import type { Options, ResolvedOptions, ResolverClient } from '@internals/client'
 
 export type { Options, ResolvedOptions, ResolverClient } from '@internals/client'

package/templates/fetch.ts

@@ -1,4 +1,4 @@
-import { applyHeaderStyles, defaultBodySerializer, defaultPathSerializer, defaultQuerySerializer, serializeCookies } from './serializers'
+import { applyHeaderStyles, defaultBodySerializer, defaultPathSerializer, defaultQuerySerializer, isDefaultJsonBody, serializeCookies } from './serializers'
 import type { HeadersInit, PathParamStyle, PathSerializer, Serializers, Styles } from './serializers'
 import { type StandardSchemaValidator, validateStandardSchema } from './standardSchema.ts'
 
@@ -323,6 +323,15 @@ function mergeHeaders(...sources: Array<HeadersInit | undefined>): Record<string
   return Object.assign({}, ...sources.map(serializeHeaders))
 }
 
+function getHeader(headers: Record<string, string>, name: string): string | undefined {
+  const key = Object.keys(headers).find((k) => k.toLowerCase() === name.toLowerCase())
+  return key ? headers[key] : undefined
+}
+
+function hasHeader(headers: Record<string, string>, name: string): boolean {
+  return Object.keys(headers).some((k) => k.toLowerCase() === name.toLowerCase())
+}
+
 /**
  * Joins the URL parts, interpolates URL-encoded `{param}` segments, and appends the serialized query, shared by the send path and `getUrl`.
  */
@@ -387,9 +396,6 @@ export async function resolveAuth(params: {
   const { security, auth, headers, query } = params
   if (!security?.length || auth === undefined) return
 
-  // An explicit caller-set header wins over the resolved token.
-  const hasHeader = (name: string) => Object.keys(headers).some((key) => key.toLowerCase() === name.toLowerCase())
-
   for (const scheme of security) {
     const token = typeof auth === 'function' ? await auth(scheme) : auth
     if (token === undefined) continue
@@ -400,10 +406,10 @@ export async function resolveAuth(params: {
         if (query[name] === undefined) query[name] = token
       } else if (scheme.in === 'cookie') {
         headers.Cookie = [headers.Cookie, `${name}=${token}`].filter(Boolean).join('; ')
-      } else if (!hasHeader(name)) {
+      } else if (!hasHeader(headers, name)) {
         headers[name] = token
       }
-    } else if (!hasHeader('Authorization')) {
+    } else if (!hasHeader(headers, 'Authorization')) {
       headers.Authorization = scheme.scheme === 'basic' ? `Basic ${btoa(token)}` : `Bearer ${token}`
     }
     return
@@ -469,8 +475,8 @@ async function resolveRequest<TBody, TRequest, TResponse>({
 
   const headers = mergeHeaders(config.headers, applyHeaderStyles(requestConfig.headers, requestConfig.styles?.header))
   const { request: requestContentTypeOption, response: responseContentType } = resolveContentType(requestConfig.contentType)
-  const requestContentType = requestContentTypeOption ?? headers['Content-Type'] ?? headers['content-type']
-  if (responseContentType && headers['Accept'] === undefined && headers['accept'] === undefined) {
+  const requestContentType = requestContentTypeOption ?? getHeader(headers, 'content-type')
+  if (responseContentType && !hasHeader(headers, 'accept')) {
     headers['Accept'] = responseContentType
   }
 
@@ -491,15 +497,19 @@ async function resolveRequest<TBody, TRequest, TResponse>({
   const validatedBody = await runValidator(requestConfig.validator?.request, requestConfig.body)
   const requestContentTypeBase = baseContentType(requestContentType)
   const contentCodec = requestContentTypeBase ? codecs[requestContentTypeBase] : undefined
+  const usesDefaultBodySerializer = !contentCodec?.serialize && bodySerializer === defaultBodySerializer
   const body = contentCodec?.serialize
     ? contentCodec.serialize(validatedBody, requestContentType)
     : bodySerializer({ body: validatedBody, contentType: requestContentType, encoding: requestConfig.styles?.body })
   // A FormData body must keep its Content-Type unset so the runtime appends the multipart boundary.
   if (body instanceof FormData) {
-    delete headers['Content-Type']
-    delete headers['content-type']
+    for (const key of Object.keys(headers)) {
+      if (key.toLowerCase() === 'content-type') delete headers[key]
+    }
   } else if (requestContentTypeOption) {
     headers['Content-Type'] = requestContentTypeOption
+  } else if (usesDefaultBodySerializer && isDefaultJsonBody(validatedBody) && !hasHeader(headers, 'content-type')) {
+    headers['Content-Type'] = 'application/json'
   }
 
   const url = serializeUrl({

package/templates/serializers.ts

@@ -122,6 +122,10 @@ function isFormBody(body: unknown): body is BodyInit {
   )
 }
 
+export function isDefaultJsonBody(body: unknown): boolean {
+  return body !== undefined && body !== null && !isFormBody(body)
+}
+
 function appendFormDataValue({ formData, key, value, contentType }: { formData: FormData; key: string; value: unknown; contentType?: string }): void {
   if (value === undefined || value === null) return
   if (value instanceof Blob) formData.append(key, value)