@hey-api/openapi-ts 0.91.0 → 0.92.0

package/dist/clients/nuxt/utils.ts

@@ -47,19 +47,14 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
         style = 'matrix';
       }
 
-      const value = toValue(
-        (toValue(path) as Record<string, unknown> | undefined)?.[name],
-      );
+      const value = toValue((toValue(path) as Record<string, unknown> | undefined)?.[name]);
 
       if (value === undefined || value === null) {
         continue;
       }
 
       if (Array.isArray(value)) {
-        url = url.replace(
-          match,
-          serializeArrayParam({ explode, name, style, value }),
-        );
+        url = url.replace(match, serializeArrayParam({ explode, name, style, value }));
         continue;
       }
 
@@ -192,9 +187,7 @@ export const setAuthParams = async ({
         if (!options.query) {
           options.query = {};
         }
-        const queryValue = toValue(options.query) as
-          | Record<string, unknown>
-          | undefined;
+        const queryValue = toValue(options.query) as Record<string, unknown> | undefined;
         if (queryValue) {
           queryValue[name] = token;
         }
@@ -282,9 +275,7 @@ export const mergeHeaders = (
     }
 
     const iterator =
-      h instanceof Headers
-        ? headersEntries(h)
-        : Object.entries(h as Record<string, unknown>);
+      h instanceof Headers ? headersEntries(h) : Object.entries(h as Record<string, unknown>);
 
     for (const [key, value] of iterator) {
       if (value === null) {
@@ -297,10 +288,7 @@ export const mergeHeaders = (
         const v = unwrapRefs(value);
         // assume object headers are meant to be JSON stringified, i.e. their
         // content value in OpenAPI specification is 'application/json'
-        mergedHeaders.set(
-          key,
-          typeof v === 'object' ? JSON.stringify(v) : (v as string),
-        );
+        mergedHeaders.set(key, typeof v === 'object' ? JSON.stringify(v) : (v as string));
       }
     }
   }

package/dist/clients/ofetch/client.ts

@@ -3,12 +3,7 @@ import { ofetch, type ResponseType as OfetchResponseType } from 'ofetch';
 import { createSseClient } from '../core/serverSentEvents';
 import type { HttpMethod } from '../core/types';
 import { getValidRequestBody } from '../core/utils';
-import type {
-  Client,
-  Config,
-  RequestOptions,
-  ResolvedRequestOptions,
-} from './types';
+import type { Client, Config, RequestOptions, ResolvedRequestOptions } from './types';
 import {
   buildOfetchOptions,
   buildUrl,
@@ -40,12 +35,7 @@ export const createClient = (config: Config = {}): Client => {
     return getConfig();
   };
 
-  const interceptors = createInterceptors<
-    Request,
-    Response,
-    unknown,
-    ResolvedRequestOptions
-  >();
+  const interceptors = createInterceptors<Request, Response, unknown, ResolvedRequestOptions>();
 
   // precompute serialized / network body
   const resolveOptions = async (options: RequestOptions) => {
@@ -81,22 +71,15 @@ export const createClient = (config: Config = {}): Client => {
     if (
       opts.body !== undefined &&
       opts.bodySerializer === null &&
-      (opts.headers.get('Content-Type') || '').toLowerCase() ===
-        'application/json'
+      (opts.headers.get('Content-Type') || '').toLowerCase() === 'application/json'
     ) {
       const b: unknown = opts.body;
       if (typeof FormData !== 'undefined' && b instanceof FormData) {
         // let the runtime set the multipart boundary
         opts.headers.delete('Content-Type');
-      } else if (
-        typeof URLSearchParams !== 'undefined' &&
-        b instanceof URLSearchParams
-      ) {
+      } else if (typeof URLSearchParams !== 'undefined' && b instanceof URLSearchParams) {
         // standard urlencoded content type (+ charset)
-        opts.headers.set(
-          'Content-Type',
-          'application/x-www-form-urlencoded;charset=UTF-8',
-        );
+        opts.headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
       } else if (typeof Blob !== 'undefined' && b instanceof Blob) {
         const t = b.type?.trim();
         if (t) {
@@ -109,10 +92,7 @@ export const createClient = (config: Config = {}): Client => {
     }
 
     // precompute network body (stability for retries and interceptors)
-    const networkBody = getValidRequestBody(opts) as
-      | RequestInit['body']
-      | null
-      | undefined;
+    const networkBody = getValidRequestBody(opts) as RequestInit['body'] | null | undefined;
 
     const url = buildUrl(opts);
 
@@ -158,21 +138,17 @@ export const createClient = (config: Config = {}): Client => {
     body: BodyInit | null | undefined,
     responseType: OfetchResponseType | undefined,
   ) => {
-    const effectiveRetry = isRepeatableBody(body)
-      ? (opts.retry as any)
-      : (0 as any);
+    const effectiveRetry = isRepeatableBody(body) ? (opts.retry as any) : (0 as any);
     return buildOfetchOptions(opts, body, responseType, effectiveRetry);
   };
 
   const request: Client['request'] = async (options) => {
-    const {
-      networkBody: initialNetworkBody,
-      opts,
-      url,
-    } = await resolveOptions(options as any);
+    const { networkBody: initialNetworkBody, opts, url } = await resolveOptions(options as any);
     // map parseAs -> ofetch responseType once per request
-    const ofetchResponseType: OfetchResponseType | undefined =
-      mapParseAsToResponseType(opts.parseAs, opts.responseType);
+    const ofetchResponseType: OfetchResponseType | undefined = mapParseAsToResponseType(
+      opts.parseAs,
+      opts.responseType,
+    );
 
     const $ofetch = opts.ofetch ?? ofetch;
 
@@ -230,30 +206,28 @@ export const createClient = (config: Config = {}): Client => {
     return wrapErrorReturn(finalError, result, opts.responseStyle) as any;
   };
 
-  const makeMethodFn =
-    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
-      request({ ...options, method } as any);
-
-  const makeSseFn =
-    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
-      const { networkBody, opts, url } = await resolveOptions(options);
-      const optsForSse: any = { ...opts };
-      delete optsForSse.body; // body is provided via serializedBody below
-      return createSseClient({
-        ...optsForSse,
-        fetch: opts.fetch,
-        headers: opts.headers as Headers,
-        method,
-        onRequest: async (url, init) => {
-          let request = new Request(url, init);
-          request = await applyRequestInterceptors(request, opts, networkBody);
-          return request;
-        },
-        serializedBody: networkBody as BodyInit | null | undefined,
-        signal: opts.signal,
-        url,
-      });
-    };
+  const makeMethodFn = (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+    request({ ...options, method } as any);
+
+  const makeSseFn = (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+    const { networkBody, opts, url } = await resolveOptions(options);
+    const optsForSse: any = { ...opts };
+    delete optsForSse.body; // body is provided via serializedBody below
+    return createSseClient({
+      ...optsForSse,
+      fetch: opts.fetch,
+      headers: opts.headers as Headers,
+      method,
+      onRequest: async (url, init) => {
+        let request = new Request(url, init);
+        request = await applyRequestInterceptors(request, opts, networkBody);
+        return request;
+      },
+      serializedBody: networkBody as BodyInit | null | undefined,
+      signal: opts.signal,
+      url,
+    });
+  };
 
   return {
     buildUrl,

package/dist/clients/ofetch/types.ts

@@ -1,7 +1,4 @@
-import type {
-  FetchOptions as OfetchOptions,
-  ResponseType as OfetchResponseType,
-} from 'ofetch';
+import type { FetchOptions as OfetchOptions, ResponseType as OfetchResponseType } from 'ofetch';
 import type { ofetch } from 'ofetch';
 
 import type { Auth } from '../core/auth';
@@ -9,17 +6,13 @@ import type {
   ServerSentEventsOptions,
   ServerSentEventsResult,
 } from '../core/serverSentEvents';
-import type {
-  Client as CoreClient,
-  Config as CoreConfig,
-} from '../core/types';
+import type { Client as CoreClient, Config as CoreConfig } from '../core/types';
 import type { Middleware } from './utils';
 
 export type ResponseStyle = 'data' | 'fields';
 
 export interface Config<T extends ClientOptions = ClientOptions>
-  extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
-    CoreConfig {
+  extends Omit<RequestInit, 'body' | 'headers' | 'method'>, CoreConfig {
   /**
    * HTTP(S) agent configuration (Node.js only). Passed through to ofetch.
    */
@@ -84,14 +77,7 @@ export interface Config<T extends ClientOptions = ClientOptions>
    *
    * @default 'auto'
    */
-  parseAs?:
-    | 'arrayBuffer'
-    | 'auto'
-    | 'blob'
-    | 'formData'
-    | 'json'
-    | 'stream'
-    | 'text';
+  parseAs?: 'arrayBuffer' | 'auto' | 'blob' | 'formData' | 'json' | 'stream' | 'text';
   /** Custom response parser (ofetch). */
   parseResponse?: OfetchOptions['parseResponse'];
   /**
@@ -134,7 +120,9 @@ export interface RequestOptions<
   TResponseStyle extends ResponseStyle = 'fields',
   ThrowOnError extends boolean = boolean,
   Url extends string = string,
-> extends Config<{
+>
+  extends
+    Config<{
       responseStyle: TResponseStyle;
       throwOnError: ThrowOnError;
     }>,
@@ -181,32 +169,22 @@ export type RequestResult<
           ? TData[keyof TData]
           : TData
         : {
-            data: TData extends Record<string, unknown>
-              ? TData[keyof TData]
-              : TData;
+            data: TData extends Record<string, unknown> ? TData[keyof TData] : TData;
             request: Request;
             response: Response;
           }
     >
   : Promise<
       TResponseStyle extends 'data'
-        ?
-            | (TData extends Record<string, unknown>
-                ? TData[keyof TData]
-                : TData)
-            | undefined
+        ? (TData extends Record<string, unknown> ? TData[keyof TData] : TData) | undefined
         : (
             | {
-                data: TData extends Record<string, unknown>
-                  ? TData[keyof TData]
-                  : TData;
+                data: TData extends Record<string, unknown> ? TData[keyof TData] : TData;
                 error: undefined;
               }
             | {
                 data: undefined;
-                error: TError extends Record<string, unknown>
-                  ? TError[keyof TError]
-                  : TError;
+                error: TError extends Record<string, unknown> ? TError[keyof TError] : TError;
               }
           ) & {
             request: Request;
@@ -245,10 +223,7 @@ type RequestFn = <
   TResponseStyle extends ResponseStyle = 'fields',
 >(
   options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> &
-    Pick<
-      Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>,
-      'method'
-    >,
+    Pick<Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>, 'method'>,
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type BuildUrlFn = <
@@ -262,13 +237,7 @@ type BuildUrlFn = <
   options: TData & Options<TData>,
 ) => string;
 
-export type Client = CoreClient<
-  RequestFn,
-  Config,
-  MethodFn,
-  BuildUrlFn,
-  SseFn
-> & {
+export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn, SseFn> & {
   interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
 };
 

package/dist/clients/ofetch/utils.ts

@@ -1,7 +1,4 @@
-import type {
-  FetchOptions as OfetchOptions,
-  ResponseType as OfetchResponseType,
-} from 'ofetch';
+import type { FetchOptions as OfetchOptions, ResponseType as OfetchResponseType } from 'ofetch';
 
 import { getAuthToken } from '../core/auth';
 import type { QuerySerializerOptions } from '../core/bodySerializer';
@@ -75,9 +72,7 @@ export const createQuerySerializer = <T = unknown>({
 /**
  * Infers parseAs value from provided Content-Type header.
  */
-export const getParseAs = (
-  contentType: string | null,
-): Exclude<Config['parseAs'], 'auto'> => {
+export const getParseAs = (contentType: string | null): Exclude<Config['parseAs'], 'auto'> => {
   if (!contentType) {
     // If no Content-Type header is provided, the best we can do is return the raw response body,
     // which is effectively the same as the 'stream' option.
@@ -90,10 +85,7 @@ export const getParseAs = (
     return;
   }
 
-  if (
-    cleanContent.startsWith('application/json') ||
-    cleanContent.endsWith('+json')
-  ) {
+  if (cleanContent.startsWith('application/json') || cleanContent.endsWith('+json')) {
     return 'json';
   }
 
@@ -102,9 +94,7 @@ export const getParseAs = (
   }
 
   if (
-    ['application/', 'audio/', 'image/', 'video/'].some((type) =>
-      cleanContent.startsWith(type),
-    )
+    ['application/', 'audio/', 'image/', 'video/'].some((type) => cleanContent.startsWith(type))
   ) {
     return 'blob';
   }
@@ -233,10 +223,7 @@ export const mergeHeaders = (
       continue;
     }
 
-    const iterator =
-      header instanceof Headers
-        ? headersEntries(header)
-        : Object.entries(header);
+    const iterator = header instanceof Headers ? headersEntries(header) : Object.entries(header);
 
     for (const [key, value] of iterator) {
       if (value === null) {
@@ -264,17 +251,13 @@ export const mergeHeaders = (
 export const isRepeatableBody = (body: unknown): boolean => {
   if (body == null) return true; // undefined/null treated as no-body
   if (typeof body === 'string') return true;
-  if (typeof URLSearchParams !== 'undefined' && body instanceof URLSearchParams)
-    return true;
-  if (typeof Uint8Array !== 'undefined' && body instanceof Uint8Array)
-    return true;
-  if (typeof ArrayBuffer !== 'undefined' && body instanceof ArrayBuffer)
-    return true;
+  if (typeof URLSearchParams !== 'undefined' && body instanceof URLSearchParams) return true;
+  if (typeof Uint8Array !== 'undefined' && body instanceof Uint8Array) return true;
+  if (typeof ArrayBuffer !== 'undefined' && body instanceof ArrayBuffer) return true;
   if (typeof Blob !== 'undefined' && body instanceof Blob) return true;
   if (typeof FormData !== 'undefined' && body instanceof FormData) return true;
   // Streams are not repeatable
-  if (typeof ReadableStream !== 'undefined' && body instanceof ReadableStream)
-    return false;
+  if (typeof ReadableStream !== 'undefined' && body instanceof ReadableStream) return false;
   // Default: assume non-repeatable for unknown structured bodies
   return false;
 };
@@ -286,13 +269,8 @@ export const wrapDataReturn = <T>(
   data: T,
   result: { request: Request; response: Response },
   responseStyle: ResponseStyle | undefined,
-):
-  | T
-  | ((T extends Record<string, unknown> ? { data: T } : { data: T }) &
-      typeof result) =>
-  (responseStyle ?? 'fields') === 'data'
-    ? (data as any)
-    : ({ data, ...result } as any);
+): T | ((T extends Record<string, unknown> ? { data: T } : { data: T }) & typeof result) =>
+  (responseStyle ?? 'fields') === 'data' ? (data as any) : ({ data, ...result } as any);
 
 /**
  * Small helper to unify error vs fields return style.
@@ -303,11 +281,8 @@ export const wrapErrorReturn = <E>(
   responseStyle: ResponseStyle | undefined,
 ):
   | undefined
-  | ((E extends Record<string, unknown> ? { error: E } : { error: E }) &
-      typeof result) =>
-  (responseStyle ?? 'fields') === 'data'
-    ? undefined
-    : ({ error, ...result } as any);
+  | ((E extends Record<string, unknown> ? { error: E } : { error: E }) & typeof result) =>
+  (responseStyle ?? 'fields') === 'data' ? undefined : ({ error, ...result } as any);
 
 /**
  * Build options for $ofetch.raw from our resolved opts and body.
@@ -324,9 +299,7 @@ export const buildOfetchOptions = (
     credentials: opts.credentials as OfetchOptions['credentials'],
     dispatcher: opts.dispatcher as OfetchOptions['dispatcher'],
     headers: opts.headers as Headers,
-    ignoreResponseError:
-      (opts.ignoreResponseError as OfetchOptions['ignoreResponseError']) ??
-      true,
+    ignoreResponseError: (opts.ignoreResponseError as OfetchOptions['ignoreResponseError']) ?? true,
     method: opts.method,
     onRequest: opts.onRequest as OfetchOptions['onRequest'],
     onRequestError: opts.onRequestError as OfetchOptions['onRequestError'],
@@ -338,8 +311,7 @@ export const buildOfetchOptions = (
     responseType,
     retry: retryOverride ?? (opts.retry as OfetchOptions['retry']),
     retryDelay: opts.retryDelay as OfetchOptions['retryDelay'],
-    retryStatusCodes:
-      opts.retryStatusCodes as OfetchOptions['retryStatusCodes'],
+    retryStatusCodes: opts.retryStatusCodes as OfetchOptions['retryStatusCodes'],
     signal: opts.signal,
     timeout: opts.timeout as number | undefined,
   }) as OfetchOptions;
@@ -358,15 +330,11 @@ export const parseSuccess = async (
   }
 
   const inferredParseAs =
-    (opts.parseAs === 'auto'
-      ? getParseAs(response.headers.get('Content-Type'))
-      : opts.parseAs) ?? 'json';
+    (opts.parseAs === 'auto' ? getParseAs(response.headers.get('Content-Type')) : opts.parseAs) ??
+    'json';
 
   // Handle empty responses
-  if (
-    response.status === 204 ||
-    response.headers.get('Content-Length') === '0'
-  ) {
+  if (response.status === 204 || response.headers.get('Content-Length') === '0') {
     switch (inferredParseAs) {
       case 'arrayBuffer':
       case 'blob':
@@ -442,10 +410,7 @@ type ErrInterceptor<Err, Res, Req, Options> = (
   options: Options,
 ) => Err | Promise<Err>;
 
-type ReqInterceptor<Req, Options> = (
-  request: Req,
-  options: Options,
-) => Req | Promise<Req>;
+type ReqInterceptor<Req, Options> = (request: Req, options: Options) => Req | Promise<Req>;
 
 type ResInterceptor<Res, Req, Options> = (
   response: Res,
@@ -479,10 +444,7 @@ class Interceptors<Interceptor> {
     return this.fns.indexOf(id);
   }
 
-  update(
-    id: number | Interceptor,
-    fn: Interceptor,
-  ): number | Interceptor | false {
+  update(id: number | Interceptor, fn: Interceptor): number | Interceptor | false {
     const index = this.getInterceptorIndex(id);
     if (this.fns[index]) {
       this.fns[index] = fn;