@hey-api/openapi-ts 0.90.10 → 0.91.1

package/dist/clients/ky/types.ts

@@ -1,12 +1,12 @@
+import type { Options as KyOptions } from 'ky';
+import type ky from 'ky';
+
 import type { Auth } from '../core/auth';
 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';
@@ -23,9 +23,7 @@ export interface RetryOptions {
    *
    * @default ['get', 'put', 'head', 'delete', 'options', 'trace']
    */
-  methods?: Array<
-    'get' | 'post' | 'put' | 'delete' | 'patch' | 'head' | 'options' | 'trace'
-  >;
+  methods?: Array<'get' | 'post' | 'put' | 'delete' | 'patch' | 'head' | 'options' | 'trace'>;
   /**
    * HTTP status codes to retry
    *
@@ -35,10 +33,8 @@ export interface RetryOptions {
 }
 
 export interface Config<T extends ClientOptions = ClientOptions>
-  extends Omit<
-      import('ky').Options,
-      'body' | 'headers' | 'method' | 'prefixUrl' | 'retry' | 'throwHttpErrors'
-    >,
+  extends
+    Omit<KyOptions, 'body' | 'headers' | 'method' | 'prefixUrl' | 'retry' | 'throwHttpErrors'>,
     CoreConfig {
   /**
    * Base URL for all requests made by this client.
@@ -48,12 +44,12 @@ export interface Config<T extends ClientOptions = ClientOptions>
    * Ky instance to use. You can use this option to provide a custom
    * ky instance.
    */
-  ky?: typeof import('ky').default;
+  ky?: typeof ky;
   /**
    * Additional ky-specific options that will be passed directly to ky.
    * This allows you to use any ky option not explicitly exposed in the config.
    */
-  kyOptions?: Omit<import('ky').Options, 'method' | 'prefixUrl'>;
+  kyOptions?: Omit<KyOptions, 'method' | 'prefixUrl'>;
   /**
    * Return the response data parsed in a specified format. By default, `auto`
    * will infer the appropriate method from the `Content-Type` response header.
@@ -62,14 +58,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';
   /**
    * Should we return only data or multiple fields (data, error, response, etc.)?
    *
@@ -99,7 +88,9 @@ export interface RequestOptions<
   TResponseStyle extends ResponseStyle = 'fields',
   ThrowOnError extends boolean = boolean,
   Url extends string = string,
-> extends Config<{
+>
+  extends
+    Config<{
       responseStyle: TResponseStyle;
       throwOnError: ThrowOnError;
     }>,
@@ -146,32 +137,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;
@@ -210,10 +191,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 = <
@@ -227,13 +205,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/ky/utils.ts

@@ -63,9 +63,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) {
     return 'stream';
   }
@@ -76,10 +74,7 @@ export const getParseAs = (
     return;
   }
 
-  if (
-    cleanContent.startsWith('application/json') ||
-    cleanContent.endsWith('+json')
-  ) {
+  if (cleanContent.startsWith('application/json') || cleanContent.endsWith('+json')) {
     return 'json';
   }
 
@@ -88,9 +83,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';
   }
@@ -197,10 +190,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) {
@@ -227,10 +217,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,
@@ -264,10 +251,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;

package/dist/clients/next/client.ts

@@ -1,12 +1,7 @@
 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 {
   buildUrl,
   createConfig,
@@ -32,11 +27,7 @@ export const createClient = (config: Config = {}): Client => {
     return getConfig();
   };
 
-  const interceptors = createInterceptors<
-    Response,
-    unknown,
-    ResolvedRequestOptions
-  >();
+  const interceptors = createInterceptors<Response, unknown, ResolvedRequestOptions>();
 
   const beforeRequest = async (options: RequestOptions) => {
     const opts = {
@@ -109,10 +100,7 @@ export const createClient = (config: Config = {}): Client => {
           ? getParseAs(response.headers.get('Content-Type'))
           : opts.parseAs) ?? 'json';
 
-      if (
-        response.status === 204 ||
-        response.headers.get('Content-Length') === '0'
-      ) {
+      if (response.status === 204 || response.headers.get('Content-Length') === '0') {
         let emptyData: any;
         switch (parseAs) {
           case 'arrayBuffer':
@@ -205,40 +193,35 @@ export const createClient = (config: Config = {}): Client => {
     };
   };
 
-  const makeMethodFn =
-    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
-      request({ ...options, method });
+  const makeMethodFn = (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+    request({ ...options, method });
 
-  const makeSseFn =
-    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
-      const { opts, url } = await beforeRequest(options);
-      return createSseClient({
-        ...opts,
-        body: opts.body as BodyInit | null | undefined,
-        headers: opts.headers as unknown as Record<string, string>,
-        method,
-        onRequest: async (url, init) => {
-          let request = new Request(url, init);
-          const requestInit = {
-            ...init,
-            method: init.method as Config['method'],
-            url,
-          };
-          for (const fn of interceptors.request.fns) {
-            if (fn) {
-              await fn(requestInit);
-              request = new Request(requestInit.url, requestInit);
-            }
+  const makeSseFn = (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+    const { opts, url } = await beforeRequest(options);
+    return createSseClient({
+      ...opts,
+      body: opts.body as BodyInit | null | undefined,
+      headers: opts.headers as unknown as Record<string, string>,
+      method,
+      onRequest: async (url, init) => {
+        let request = new Request(url, init);
+        const requestInit = {
+          ...init,
+          method: init.method as Config['method'],
+          url,
+        };
+        for (const fn of interceptors.request.fns) {
+          if (fn) {
+            await fn(requestInit);
+            request = new Request(requestInit.url, requestInit);
           }
-          return request;
-        },
-        serializedBody: getValidRequestBody(opts) as
-          | BodyInit
-          | null
-          | undefined,
-        url,
-      });
-    };
+        }
+        return request;
+      },
+      serializedBody: getValidRequestBody(opts) as BodyInit | null | undefined,
+      url,
+    });
+  };
 
   return {
     buildUrl,

package/dist/clients/next/types.ts

@@ -3,15 +3,11 @@ 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 interface Config<T extends ClientOptions = ClientOptions>
-  extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
-    CoreConfig {
+  extends Omit<RequestInit, 'body' | 'headers' | 'method'>, CoreConfig {
   /**
    * Base URL for all requests made by this client.
    */
@@ -31,14 +27,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';
   /**
    * Throw an error instead of returning it in the response?
    *
@@ -51,7 +40,9 @@ export interface RequestOptions<
   TData = unknown,
   ThrowOnError extends boolean = boolean,
   Url extends string = string,
-> extends Config<{
+>
+  extends
+    Config<{
       throwOnError: ThrowOnError;
     }>,
     Pick<
@@ -96,16 +87,12 @@ export type RequestResult<
   : Promise<
       (
         | {
-            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;
           }
       ) & {
         response: Response;
@@ -117,27 +104,15 @@ export interface ClientOptions {
   throwOnError?: boolean;
 }
 
-type MethodFn = <
-  TData = unknown,
-  TError = unknown,
-  ThrowOnError extends boolean = false,
->(
+type MethodFn = <TData = unknown, TError = unknown, ThrowOnError extends boolean = false>(
   options: Omit<RequestOptions<TData, ThrowOnError>, 'method'>,
 ) => RequestResult<TData, TError, ThrowOnError>;
 
-type SseFn = <
-  TData = unknown,
-  TError = unknown,
-  ThrowOnError extends boolean = false,
->(
+type SseFn = <TData = unknown, TError = unknown, ThrowOnError extends boolean = false>(
   options: Omit<RequestOptions<TData, ThrowOnError>, 'method'>,
 ) => Promise<ServerSentEventsResult<TData, TError>>;
 
-type RequestFn = <
-  TData = unknown,
-  TError = unknown,
-  ThrowOnError extends boolean = false,
->(
+type RequestFn = <TData = unknown, TError = unknown, ThrowOnError extends boolean = false>(
   options: Omit<RequestOptions<TData, ThrowOnError>, 'method'> &
     Pick<Required<RequestOptions<TData, ThrowOnError>>, 'method'>,
 ) => RequestResult<TData, TError, ThrowOnError>;
@@ -153,13 +128,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<Response, unknown, ResolvedRequestOptions>;
 };
 
@@ -189,8 +158,5 @@ export type Options<
   TData extends TDataShape = TDataShape,
   ThrowOnError extends boolean = boolean,
   TResponse = unknown,
-> = OmitKeys<
-  RequestOptions<TResponse, ThrowOnError>,
-  'body' | 'path' | 'query' | 'url'
-> &
+> = OmitKeys<RequestOptions<TResponse, ThrowOnError>, 'body' | 'path' | 'query' | 'url'> &
   ([TData] extends [never] ? unknown : Omit<TData, 'url'>);

package/dist/clients/next/utils.ts

@@ -51,10 +51,7 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
       }
 
       if (Array.isArray(value)) {
-        url = url.replace(
-          match,
-          serializeArrayParam({ explode, name, style, value }),
-        );
+        url = url.replace(match, serializeArrayParam({ explode, name, style, value }));
         continue;
       }
 
@@ -146,9 +143,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.
@@ -161,10 +156,7 @@ export const getParseAs = (
     return;
   }
 
-  if (
-    cleanContent.startsWith('application/json') ||
-    cleanContent.endsWith('+json')
-  ) {
+  if (cleanContent.startsWith('application/json') || cleanContent.endsWith('+json')) {
     return 'json';
   }
 
@@ -173,9 +165,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';
   }
@@ -311,10 +301,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) {
@@ -344,10 +331,7 @@ type ErrInterceptor<Err, Res, Options> = (
 
 type ReqInterceptor<Options> = (options: Options) => void | Promise<void>;
 
-type ResInterceptor<Res, Options> = (
-  response: Res,
-  options: Options,
-) => Res | Promise<Res>;
+type ResInterceptor<Res, Options> = (response: Res, options: Options) => Res | Promise<Res>;
 
 class Interceptors<Interceptor> {
   fns: Array<Interceptor | null> = [];
@@ -375,10 +359,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;
@@ -399,11 +380,7 @@ export interface Middleware<Res, Err, Options> {
   response: Interceptors<ResInterceptor<Res, Options>>;
 }
 
-export const createInterceptors = <Res, Err, Options>(): Middleware<
-  Res,
-  Err,
-  Options
-> => ({
+export const createInterceptors = <Res, Err, Options>(): Middleware<Res, Err, Options> => ({
   error: new Interceptors<ErrInterceptor<Err, Res, Options>>(),
   request: new Interceptors<ReqInterceptor<Options>>(),
   response: new Interceptors<ResInterceptor<Res, Options>>(),

package/dist/clients/nuxt/client.ts

@@ -1,9 +1,4 @@
-import {
-  useAsyncData,
-  useFetch,
-  useLazyAsyncData,
-  useLazyFetch,
-} from 'nuxt/app';
+import { useAsyncData, useFetch, useLazyAsyncData, useLazyFetch } from 'nuxt/app';
 import { reactive, ref, watch } from 'vue';
 
 import { createSseClient } from '../core/serverSentEvents';
@@ -58,11 +53,7 @@ export const createClient = (config: Config = {}): Client => {
     return { opts, url };
   };
 
-  const request: Client['request'] = ({
-    asyncDataOptions,
-    composable = '$fetch',
-    ...options
-  }) => {
+  const request: Client['request'] = ({ asyncDataOptions, composable = '$fetch', ...options }) => {
     const key = options.key;
     const opts = {
       ..._config,
@@ -73,12 +64,7 @@ export const createClient = (config: Config = {}): Client => {
       onResponse: mergeInterceptors(_config.onResponse, options.onResponse),
     };
 
-    const {
-      requestValidator,
-      responseTransformer,
-      responseValidator,
-      security,
-    } = opts;
+    const { requestValidator, responseTransformer, responseValidator, security } = opts;
     if (requestValidator || security) {
       // auth must happen in interceptors otherwise we'd need to require
       // asyncContext enabled
@@ -182,26 +168,21 @@ export const createClient = (config: Config = {}): Client => {
     return undefined as any;
   };
 
-  const makeMethodFn =
-    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
-      request({ ...options, method });
-
-  const makeSseFn =
-    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
-      const { opts, url } = await beforeRequest(options);
-      return createSseClient({
-        ...unwrapRefs(opts),
-        body: opts.body as BodyInit | null | undefined,
-        method,
-        onRequest: undefined,
-        serializedBody: getValidRequestBody(opts) as
-          | BodyInit
-          | null
-          | undefined,
-        signal: unwrapRefs(opts.signal) as AbortSignal,
-        url,
-      });
-    };
+  const makeMethodFn = (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+    request({ ...options, method });
+
+  const makeSseFn = (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+    const { opts, url } = await beforeRequest(options);
+    return createSseClient({
+      ...unwrapRefs(opts),
+      body: opts.body as BodyInit | null | undefined,
+      method,
+      onRequest: undefined,
+      serializedBody: getValidRequestBody(opts) as BodyInit | null | undefined,
+      signal: unwrapRefs(opts.signal) as AbortSignal,
+      url,
+    });
+  };
 
   return {
     buildUrl,