@kubb/plugin-fetch 5.14.0-canary.20261109T134631 → 6.0.0

package/templates/client.ts

@@ -1,39 +1,21 @@
-import {
-  createClientCore,
-  getResponseContentType,
-  resolveResponseType,
-  type ResponseType,
-  type ResponseTypeMap,
-  type Transport,
-  type TransportResult,
-} from './core.ts'
-import { isJsonMediaType } from './serializers.ts'
+import { createClientCore, createLazyClient, toRequestInit } from './core.ts'
+import { defaultConfig } from './config.ts'
 import * as core from './core.ts'
 
 export * from './core.ts'
 
-/** The request and response objects of this transport, carried on every result and error. */
+/**
+ * The native request and response that every result and error carries.
+ */
 export type NativeRequest = Request
 export type NativeResponse = Response
 
 /**
- * Extra `fetch` init the transport spreads onto every `Request`, an escape hatch for fields the runtime does not set itself such as `cache`, `redirect`, and Next.js's `next`.
+ * Extra `fetch` init for a call or client, such as `cache`, `redirect`, or Next.js's `next`.
  */
-export type FetchOptions = RequestInit & { next?: Record<string, unknown> }
+export type NativeOptions = RequestInit & { next?: Record<string, unknown> }
 
-export type RequestConfig<TBody = unknown, TRequest = NativeRequest, TResponse = NativeResponse> = core.RequestConfig<TBody, TRequest, TResponse> & {
-  options?: FetchOptions
-}
-export type Options<TData extends core.DataShape, ThrowOnError extends boolean = true, TRequest = NativeRequest, TResponse = NativeResponse> = core.Options<
-  TData,
-  ThrowOnError,
-  TRequest,
-  TResponse
-> & { options?: FetchOptions }
-export type ClientConfig<TRequest = NativeRequest, TResponse = NativeResponse> = core.ClientConfig<TRequest, TResponse> & { options?: FetchOptions }
-export type ResolvedRequest = core.ResolvedRequest & { options?: FetchOptions }
 export type ResponseError<TError = unknown, TRequest = NativeRequest, TResponse = NativeResponse> = core.ResponseError<TError, TRequest, TResponse>
-/** The core's `ResponseError` class, typed with this transport's request and response. `instanceof` and `ResponseError.is` both match what the client throws. */
 export const ResponseError = core.ResponseError as {
   new <TError = unknown, TRequest = NativeRequest, TResponse = NativeResponse>(
     config: ConstructorParameters<typeof core.ResponseError<TError, TRequest, TResponse>>[0],
@@ -43,69 +25,68 @@ export const ResponseError = core.ResponseError as {
   prototype: core.ResponseError<unknown, NativeRequest, NativeResponse>
 }
 
-async function parseResponse(response: Response, responseType?: ResponseType | ResponseTypeMap): Promise<unknown> {
-  if (response.status === 204 || response.status === 205 || response.status === 304 || !response.body) {
-    return undefined
-  }
+export type RequestConfig<TBody = unknown, TRequest = NativeRequest, TResponse = NativeResponse> = core.RequestConfig<TBody, TRequest, TResponse> & {
+  options?: NativeOptions
+}
+export type Options<TData extends core.DataShape, ThrowOnError extends boolean = true, TRequest = NativeRequest, TResponse = NativeResponse> = core.Options<
+  TData,
+  ThrowOnError,
+  TRequest,
+  TResponse
+> & { options?: NativeOptions }
+export type ClientConfig<TRequest = NativeRequest, TResponse = NativeResponse> = core.ClientConfig<TRequest, TResponse> & { options?: NativeOptions }
+export type ResolvedRequest = core.ResolvedRequest & { options?: NativeOptions }
+export type RequestResult<
+  TResponses,
+  ThrowOnError extends boolean = true,
+  TRequest = NativeRequest,
+  TResponse = NativeResponse,
+  THeaders = unknown,
+> = core.RequestResult<TResponses, ThrowOnError, TRequest, TResponse, THeaders>
+export type UnwrappedResult<
+  TResponses,
+  ThrowOnError extends boolean = true,
+  TRequest = NativeRequest,
+  TResponse = NativeResponse,
+  THeaders = unknown,
+> = core.UnwrappedResult<TResponses, ThrowOnError, TRequest, TResponse, THeaders>
+export type ResponseErrorConfig<TError = unknown> = core.ResponseError<TError, NativeRequest, NativeResponse>
+export type TransportResult<TRequest = NativeRequest, TResponse = NativeResponse> = core.TransportResult<TRequest, TResponse>
+export type DecodedResponse<TData = unknown, TRequest = NativeRequest, TResponse = NativeResponse> = core.DecodedResponse<TData, TRequest, TResponse>
+export type Transport<TRequest = NativeRequest, TResponse = NativeResponse> = core.Transport<TRequest, TResponse>
+export type Interceptors<TRequest = NativeRequest, TResponse = NativeResponse> = core.Interceptors<TRequest, TResponse>
+export type ClientInstance<TRequest = NativeRequest, TResponse = NativeResponse> = core.ClientInstance<TRequest, TResponse>
+export type StreamResult<
+  TResponses,
+  ThrowOnError extends boolean = true,
+  TEvent = core.ServerSentEvent<core.SuccessOf<TResponses>>,
+  TRequest = NativeRequest,
+  TResponse = NativeResponse,
+  THeaders = unknown,
+> = core.StreamResult<TResponses, ThrowOnError, TEvent, TRequest, TResponse, THeaders>
+export type ResponseErrorOf<TResponses, TRequest = NativeRequest, TResponse = NativeResponse, THeaders = unknown> = core.ResponseErrorOf<
+  TResponses,
+  TRequest,
+  TResponse,
+  THeaders
+>
+export const isResponseError = core.isResponseError as <TResponses = unknown, TRequest = NativeRequest, TResponse = NativeResponse, THeaders = unknown>(
+  error: unknown,
+) => error is ResponseErrorOf<TResponses, TRequest, TResponse, THeaders>
 
-  const contentType = response.headers.get('Content-Type')
-  // A server may answer a streamed operation with JSON, or with an error body: both are decoded by their content type. Any other streamed success body stays a stream.
-  const resolved = resolveResponseType(responseType, contentType)
-  const detected = resolved === 'stream' && (!response.ok || isJsonMediaType(contentType)) ? resolveResponseType(undefined, contentType) : resolved
-  switch (detected) {
-    case 'text':
-    case 'document':
-      return response.text()
-    case 'blob':
-      return response.blob()
-    case 'arraybuffer':
-      return response.arrayBuffer()
-    case 'stream':
-      return response.body ?? undefined
-    case 'json': {
-      // An empty body with a JSON content-type would make response.json() throw, so treat it as no data.
-      const body = await response.text()
-      return body ? JSON.parse(body) : undefined
-    }
-  }
+export const defaultTransport = async (request: core.ResolvedRequest): Promise<TransportResult> => {
+  const nativeRequest = new Request(request.url, toRequestInit(request))
+  // `Request` drops the non-standard `next` field, so Next.js reads it from the init.
+  const nextInit: NativeOptions | undefined = request.options?.next ? { next: request.options.next } : undefined
+  const response = await globalThis.fetch(nativeRequest, nextInit)
 
-  const text = await response.text()
-  if (!text) return undefined
-  try {
-    return JSON.parse(text)
-  } catch {
-    return text
-  }
+  return { webResponse: response, request: nativeRequest, response }
 }
 
 /**
- * The default transport that sends the resolved request through `globalThis.fetch` and returns the parsed body with the native request and response.
+ * The client every generated operation uses unless a call passes its own. It is created on first use.
  */
-export const defaultTransport: Transport = async (request: ResolvedRequest): Promise<TransportResult> => {
-  const init: RequestInit = {
-    ...request.options,
-    method: request.method,
-    headers: request.headers,
-    body: request.body,
-    signal: request.signal,
-  }
-  if (request.credentials) init.credentials = request.credentials
-
-  const nativeRequest = new Request(request.url, init)
-  const response = await globalThis.fetch(nativeRequest)
-  const data = await parseResponse(response, request.responseType)
-
-  return {
-    data,
-    status: response.status,
-    statusText: response.statusText,
-    headers: response.headers,
-    contentType: getResponseContentType(response.headers),
-    request: nativeRequest,
-    response,
-  }
-}
-
-export const client = createClientCore({ defaultTransport })
+export const client: ClientInstance = createLazyClient((config) => createClientCore({ defaultTransport, ...config }))
+client.setConfig(defaultConfig)
 
-export const createClient = (config?: Parameters<typeof client.createClient>[0]) => client.createClient(config)
+export const createClient: ClientInstance['createClient'] = client.createClient

package/dist/client-Dn80AjdR.d.ts

@@ -1,39 +0,0 @@
-import { n as __exportAll, r as __reExport, t as core_d_exports } from "./core-D6FAGTsL.js";
-declare namespace client_d_exports {
-  export { ClientConfig, FetchOptions, NativeRequest, NativeResponse, Options, RequestConfig, ResolvedRequest, ResponseError, client, createClient, defaultTransport };
-}
-/** The request and response objects of this transport, carried on every result and error. */
-type NativeRequest = Request;
-type NativeResponse = Response;
-/**
- * Extra `fetch` init the transport spreads onto every `Request`, an escape hatch for fields the runtime does not set itself such as `cache`, `redirect`, and Next.js's `next`.
- */
-type FetchOptions = RequestInit & {
-  next?: Record<string, unknown>;
-};
-type RequestConfig<TBody = unknown, TRequest = NativeRequest, TResponse = NativeResponse> = core_d_exports.RequestConfig<TBody, TRequest, TResponse> & {
-  options?: FetchOptions;
-};
-type Options<TData extends core_d_exports.DataShape, ThrowOnError extends boolean = true, TRequest = NativeRequest, TResponse = NativeResponse> = core_d_exports.Options<TData, ThrowOnError, TRequest, TResponse> & {
-  options?: FetchOptions;
-};
-type ClientConfig<TRequest = NativeRequest, TResponse = NativeResponse> = core_d_exports.ClientConfig<TRequest, TResponse> & {
-  options?: FetchOptions;
-};
-type ResolvedRequest = core_d_exports.ResolvedRequest & {
-  options?: FetchOptions;
-};
-type ResponseError<TError = unknown, TRequest = NativeRequest, TResponse = NativeResponse> = core_d_exports.ResponseError<TError, TRequest, TResponse>;
-/** The core's `ResponseError` class, typed with this transport's request and response. `instanceof` and `ResponseError.is` both match what the client throws. */
-declare const ResponseError: {
-  new <TError = unknown, TRequest = NativeRequest, TResponse = NativeResponse>(config: ConstructorParameters<typeof core_d_exports.ResponseError<TError, TRequest, TResponse>>[0]): core_d_exports.ResponseError<TError, TRequest, TResponse>;
-  is: typeof core_d_exports.ResponseError.is;
-  prototype: core_d_exports.ResponseError<unknown, NativeRequest, NativeResponse>;
-};
-/**
- * The default transport that sends the resolved request through `globalThis.fetch` and returns the parsed body with the native request and response.
- */
-declare const defaultTransport: core_d_exports.Transport;
-declare const client: core_d_exports.ClientInstance<unknown, unknown>;
-declare const createClient: (config?: Parameters<typeof client.createClient>[0]) => core_d_exports.ClientInstance<unknown, unknown>;
-export { Options as a, ResponseError as c, createClient as d, defaultTransport as f, NativeResponse as i, client as l, FetchOptions as n, RequestConfig as o, NativeRequest as r, ResolvedRequest as s, ClientConfig as t, client_d_exports as u };

package/dist/core-D6FAGTsL.d.ts

@@ -1,2 +0,0 @@
-import * as import__kubb_plugin_client_templates_core_ts from "@kubb/plugin-client/templates/core.ts";
-export { __exportAll as n, __reExport as r, core_d_exports as t };

package/dist/templates/core.d.ts

@@ -1,2 +0,0 @@
-import "../core-D6FAGTsL.js";
-export * from "@kubb/plugin-client/templates/core.ts";

package/dist/templates/fetch.d.ts

@@ -1,6 +0,0 @@
-import { a as Options, c as ResponseError, d as createClient, f as defaultTransport, i as NativeResponse, l as client, n as FetchOptions, o as RequestConfig, r as NativeRequest, s as ResolvedRequest, t as ClientConfig, u as client_d_exports } from "../client-Dn80AjdR.js";
-export * from "@kubb/plugin-client/templates/core.ts";
-declare namespace fetch_d_exports {
-  export { ClientConfig, FetchOptions, NativeRequest, NativeResponse, Options, RequestConfig, ResolvedRequest, ResponseError, client, createClient, defaultTransport };
-}
-export { ClientConfig, FetchOptions, NativeRequest, NativeResponse, Options, RequestConfig, ResolvedRequest, ResponseError, client, createClient, defaultTransport };

package/dist/templates/serializers.d.ts

@@ -1 +0,0 @@
-export * from "@kubb/plugin-client/templates/serializers.ts";

package/dist/templates/standardSchema.d.ts

@@ -1 +0,0 @@
-export * from "@kubb/plugin-client/templates/standardSchema.ts";

package/src/generators/clientGenerator.tsx

@@ -1,10 +0,0 @@
-import { createClientGenerator } from '@internals/client'
-import { sseTemplatePath } from '../templates.ts'
-import type { PluginFetch } from '../types.ts'
-
-/**
- * Built-in operation generator for `@kubb/plugin-fetch`. Emits one async function per OpenAPI
- * operation using the shared `Operation` component: a grouped `<Name>Request` type and a function
- * that forwards a single `options` object to the bundled `client` and returns the `RequestResult`.
- */
-export const clientGenerator = createClientGenerator<PluginFetch>('fetch', { sse: sseTemplatePath })

package/src/templates.ts

@@ -1,16 +0,0 @@
-import { createRequire } from 'node:module'
-import { fileURLToPath } from 'node:url'
-
-const require = createRequire(import.meta.url)
-
-/** Absolute path to the fetch client template, copied into `.kubb/client.ts`. */
-export const fetchClientTemplatePath = fileURLToPath(new URL('../templates/client.ts', import.meta.url))
-
-/**
- * Absolute paths to the runtime templates `@kubb/plugin-client` ships for every client plugin, copied into `.kubb/core.ts`,
- * `.kubb/serializers.ts`, `.kubb/standardSchema.ts`, and `.kubb/sse.ts`.
- */
-export const coreTemplatePath = require.resolve('@kubb/plugin-client/templates/core.ts')
-export const serializersTemplatePath = require.resolve('@kubb/plugin-client/templates/serializers.ts')
-export const standardSchemaTemplatePath = require.resolve('@kubb/plugin-client/templates/standardSchema.ts')
-export const sseTemplatePath = require.resolve('@kubb/plugin-client/templates/sse.ts')

package/templates/core.ts

@@ -1,2 +0,0 @@
-// Resolves `./core.ts` for the client template next to it. The generator copies the file from `@kubb/plugin-client` into `.kubb/core.ts`.
-export * from '@kubb/plugin-client/templates/core.ts'

package/templates/fetch.ts

@@ -1,2 +0,0 @@
-// The client template was `templates/fetch.ts` before it became `templates/client.ts`; this keeps the old subpath working.
-export * from './client.ts'

package/templates/serializers.ts

@@ -1,2 +0,0 @@
-// Resolves `./serializers.ts` for the client template next to it. The generator copies the file from `@kubb/plugin-client` into `.kubb/serializers.ts`.
-export * from '@kubb/plugin-client/templates/serializers.ts'

package/templates/standardSchema.ts

@@ -1,2 +0,0 @@
-// Resolves `./standardSchema.ts` for the client template next to it. The generator copies the file from `@kubb/plugin-client` into `.kubb/standardSchema.ts`.
-export * from '@kubb/plugin-client/templates/standardSchema.ts'