feat: upgrade openapi-typescript-helpers

johannschopplich · Aug 24, 2024 · fb620f2 · fb620f2
1 parent 2e5393a
commit fb620f2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
     "defu": "^6.1.4",
     "ofetch": "^1.3.4",
     "ohash": "^1.1.3",
-    "openapi-typescript-helpers": "0.0.11",
+    "openapi-typescript-helpers": "0.0.12",
     "pathe": "^1.1.2",
     "scule": "^1.3.0",
     "ufo": "^1.5.4"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/runtime/openapi.ts b/src/runtime/openapi.ts
@@ -6,6 +6,7 @@ import type {
   MediaType,
   OperationRequestBodyContent,
   ResponseObjectMap,
+  IsOperationRequestBodyOptional,
   SuccessResponse,
 } from 'openapi-typescript-helpers'
 
@@ -15,14 +16,15 @@ export type FetchResponseError<T> = NuxtError<ErrorResponse<ResponseObjectMap<T>
 export type MethodOption<M, P> = 'get' extends keyof P ? { method?: M } : { method: M }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type ParamsOption<T> = T extends { parameters?: any, query?: any } ? T['parameters'] : unknown
+export type ParamsOption<T> = T extends { parameters?: any, query?: any }
+  ? T['parameters']
+  : Record<string, unknown>
 
-export type RequestBodyOption<T> =
-  OperationRequestBodyContent<T> extends never
-    ? { body?: never }
-    : undefined extends OperationRequestBodyContent<T>
-      ? { body?: OperationRequestBodyContent<T> }
-      : { body: OperationRequestBodyContent<T> }
+export type RequestBodyOption<T> = OperationRequestBodyContent<T> extends never
+  ? { body?: never }
+  : IsOperationRequestBodyOptional<T> extends true
+    ? { body?: OperationRequestBodyContent<T> }
+    : { body: OperationRequestBodyContent<T> }
 
 export type FilterMethods<T> = {
   [K in keyof Omit<T, 'parameters'> as T[K] extends never | undefined