chore: regen sdk and format

🤖 GENERATED WITH ASSISTANCE OF [OhMyOpenCode](https://github.com/code-yeongyu/oh-my-opencode)

Author: code-yeongyu

packages/sdk/js/openapi.json

@@ -1,7 +1,7 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import { type ClientOptions, type Config, createClient, createConfig } from "./client/index.js"
-import type { ClientOptions as ClientOptions2 } from "./types.gen.js"
+import type { ClientOptions } from "./types.gen.js"
+import { type Config, type ClientOptions as DefaultClientOptions, createClient, createConfig } from "./client/index.js"
 
 /**
  * The `createClientConfig()` function will be called on client initialization
@@ -11,8 +11,12 @@ import type { ClientOptions as ClientOptions2 } from "./types.gen.js"
  * `setConfig()`. This is useful for example if you're using Next.js
  * to ensure your client always has the correct values.
  */
-export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (
-  override?: Config<ClientOptions & T>,
-) => Config<Required<ClientOptions> & T>
+export type CreateClientConfig<T extends DefaultClientOptions = ClientOptions> = (
+  override?: Config<DefaultClientOptions & T>,
+) => Config<Required<DefaultClientOptions> & T>
 
-export const client = createClient(createConfig<ClientOptions2>({ baseUrl: "http://localhost:4096" }))
+export const client = createClient(
+  createConfig<ClientOptions>({
+    baseUrl: "http://localhost:4096",
+  }),
+)

packages/sdk/js/src/v2/gen/client.gen.ts

@@ -1,8 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { createSseClient } from "../core/serverSentEvents.gen.js"
-import type { HttpMethod } from "../core/types.gen.js"
-import { getValidRequestBody } from "../core/utils.gen.js"
 import type { Client, Config, RequestOptions, ResolvedRequestOptions } from "./types.gen.js"
 import {
   buildUrl,
@@ -51,12 +49,12 @@ export const createClient = (config: Config = {}): Client => {
       await opts.requestValidator(opts)
     }
 
-    if (opts.body !== undefined && opts.bodySerializer) {
+    if (opts.body && opts.bodySerializer) {
       opts.serializedBody = opts.bodySerializer(opts.body)
     }
 
     // remove Content-Type header if body is empty to avoid sending invalid requests
-    if (opts.body === undefined || opts.serializedBody === "") {
+    if (opts.serializedBody === undefined || opts.serializedBody === "") {
       opts.headers.delete("Content-Type")
     }
 
@@ -71,12 +69,12 @@ export const createClient = (config: Config = {}): Client => {
     const requestInit: ReqInit = {
       redirect: "follow",
       ...opts,
-      body: getValidRequestBody(opts),
+      body: opts.serializedBody,
     }
 
     let request = new Request(url, requestInit)
 
-    for (const fn of interceptors.request.fns) {
+    for (const fn of interceptors.request._fns) {
       if (fn) {
         request = await fn(request, opts)
       }
@@ -85,37 +83,9 @@ export const createClient = (config: Config = {}): Client => {
     // fetch must be assigned here, otherwise it would throw the error:
     // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
     const _fetch = opts.fetch!
-    let response: Response
+    let response = await _fetch(request)
 
-    try {
-      response = await _fetch(request)
-    } catch (error) {
-      // Handle fetch exceptions (AbortError, network errors, etc.)
-      let finalError = error
-
-      for (const fn of interceptors.error.fns) {
-        if (fn) {
-          finalError = (await fn(error, undefined as any, request, opts)) as unknown
-        }
-      }
-
-      finalError = finalError || ({} as unknown)
-
-      if (opts.throwOnError) {
-        throw finalError
-      }
-
-      // Return error response
-      return opts.responseStyle === "data"
-        ? undefined
-        : {
-            error: finalError,
-            request,
-            response: undefined as any,
-          }
-    }
-
-    for (const fn of interceptors.response.fns) {
+    for (const fn of interceptors.response._fns) {
       if (fn) {
         response = await fn(response, request, opts)
       }
@@ -127,36 +97,18 @@ export const createClient = (config: Config = {}): Client => {
     }
 
     if (response.ok) {
-      const parseAs =
-        (opts.parseAs === "auto" ? getParseAs(response.headers.get("Content-Type")) : opts.parseAs) ?? "json"
-
       if (response.status === 204 || response.headers.get("Content-Length") === "0") {
-        let emptyData: any
-        switch (parseAs) {
-          case "arrayBuffer":
-          case "blob":
-          case "text":
-            emptyData = await response[parseAs]()
-            break
-          case "formData":
-            emptyData = new FormData()
-            break
-          case "stream":
-            emptyData = response.body
-            break
-          case "json":
-          default:
-            emptyData = {}
-            break
-        }
         return opts.responseStyle === "data"
-          ? emptyData
+          ? {}
           : {
-              data: emptyData,
+              data: {},
               ...result,
             }
       }
 
+      const parseAs =
+        (opts.parseAs === "auto" ? getParseAs(response.headers.get("Content-Type")) : opts.parseAs) ?? "json"
+
       let data: any
       switch (parseAs) {
         case "arrayBuffer":
@@ -205,7 +157,7 @@ export const createClient = (config: Config = {}): Client => {
     const error = jsonError ?? textError
     let finalError = error
 
-    for (const fn of interceptors.error.fns) {
+    for (const fn of interceptors.error._fns) {
       if (fn) {
         finalError = (await fn(error, response, request, opts)) as string
       }
@@ -226,53 +178,35 @@ export const createClient = (config: Config = {}): Client => {
         }
   }
 
-  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)
-        for (const fn of interceptors.request.fns) {
-          if (fn) {
-            request = await fn(request, opts)
-          }
-        }
-        return request
-      },
-      url,
-    })
+  const makeMethod = (method: Required<Config>["method"]) => {
+    const fn = (options: RequestOptions) => request({ ...options, method })
+    fn.sse = 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,
+        url,
+      })
+    }
+    return fn
   }
 
   return {
     buildUrl,
-    connect: makeMethodFn("CONNECT"),
-    delete: makeMethodFn("DELETE"),
-    get: makeMethodFn("GET"),
+    connect: makeMethod("CONNECT"),
+    delete: makeMethod("DELETE"),
+    get: makeMethod("GET"),
     getConfig,
-    head: makeMethodFn("HEAD"),
+    head: makeMethod("HEAD"),
     interceptors,
-    options: makeMethodFn("OPTIONS"),
-    patch: makeMethodFn("PATCH"),
-    post: makeMethodFn("POST"),
-    put: makeMethodFn("PUT"),
+    options: makeMethod("OPTIONS"),
+    patch: makeMethod("PATCH"),
+    post: makeMethod("POST"),
+    put: makeMethod("PUT"),
     request,
     setConfig,
-    sse: {
-      connect: makeSseFn("CONNECT"),
-      delete: makeSseFn("DELETE"),
-      get: makeSseFn("GET"),
-      head: makeSseFn("HEAD"),
-      options: makeSseFn("OPTIONS"),
-      patch: makeSseFn("PATCH"),
-      post: makeSseFn("POST"),
-      put: makeSseFn("PUT"),
-      trace: makeSseFn("TRACE"),
-    },
-    trace: makeMethodFn("TRACE"),
+    trace: makeMethod("TRACE"),
   } as Client
 }

packages/sdk/js/src/v2/gen/client/client.gen.ts

@@ -8,14 +8,14 @@ export {
   urlSearchParamsBodySerializer,
 } from "../core/bodySerializer.gen.js"
 export { buildClientParams } from "../core/params.gen.js"
-export { serializeQueryKeyValue } from "../core/queryKeySerializer.gen.js"
 export { createClient } from "./client.gen.js"
 export type {
   Client,
   ClientOptions,
   Config,
   CreateClientConfig,
   Options,
+  OptionsLegacyParser,
   RequestOptions,
   RequestResult,
   ResolvedRequestOptions,

packages/sdk/js/src/v2/gen/client/index.ts

@@ -20,7 +20,7 @@ export interface Config<T extends ClientOptions = ClientOptions>
    *
    * @default globalThis.fetch
    */
-  fetch?: typeof fetch
+  fetch?: (request: Request) => ReturnType<typeof fetch>
   /**
    * Please don't use the Fetch client for Next.js applications. The `next`
    * options won't have any effect.
@@ -128,7 +128,7 @@ export interface ClientOptions {
   throwOnError?: boolean
 }
 
-type MethodFn = <
+type MethodFnBase = <
   TData = unknown,
   TError = unknown,
   ThrowOnError extends boolean = false,
@@ -137,7 +137,7 @@ type MethodFn = <
   options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, "method">,
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>
 
-type SseFn = <
+type MethodFnServerSentEvents = <
   TData = unknown,
   TError = unknown,
   ThrowOnError extends boolean = false,
@@ -146,6 +146,10 @@ type SseFn = <
   options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, "method">,
 ) => Promise<ServerSentEventsResult<TData, TError>>
 
+type MethodFn = MethodFnBase & {
+  sse: MethodFnServerSentEvents
+}
+
 type RequestFn = <
   TData = unknown,
   TError = unknown,
@@ -164,10 +168,10 @@ type BuildUrlFn = <
     url: string
   },
 >(
-  options: TData & Options<TData>,
+  options: Pick<TData, "url"> & Options<TData>,
 ) => string
 
-export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn, SseFn> & {
+export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn> & {
   interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>
 }
 
@@ -199,4 +203,20 @@ export type Options<
   TResponse = unknown,
   TResponseStyle extends ResponseStyle = "fields",
 > = OmitKeys<RequestOptions<TResponse, TResponseStyle, ThrowOnError>, "body" | "path" | "query" | "url"> &
-  ([TData] extends [never] ? unknown : Omit<TData, "url">)
+  Omit<TData, "url">
+
+export type OptionsLegacyParser<
+  TData = unknown,
+  ThrowOnError extends boolean = boolean,
+  TResponseStyle extends ResponseStyle = "fields",
+> = TData extends { body?: any }
+  ? TData extends { headers?: any }
+    ? OmitKeys<RequestOptions<unknown, TResponseStyle, ThrowOnError>, "body" | "headers" | "url"> & TData
+    : OmitKeys<RequestOptions<unknown, TResponseStyle, ThrowOnError>, "body" | "url"> &
+        TData &
+        Pick<RequestOptions<unknown, TResponseStyle, ThrowOnError>, "headers">
+  : TData extends { headers?: any }
+    ? OmitKeys<RequestOptions<unknown, TResponseStyle, ThrowOnError>, "headers" | "url"> &
+        TData &
+        Pick<RequestOptions<unknown, TResponseStyle, ThrowOnError>, "body">
+    : OmitKeys<RequestOptions<unknown, TResponseStyle, ThrowOnError>, "url"> & TData