@hey-api/openapi-ts 0.80.15 → 0.80.17

package/dist/clients/angular/client.ts

@@ -65,7 +65,6 @@ export const createClient = (config: Config = {}): Client => {
       ...options,
       headers: mergeHeaders(_config.headers, options.headers),
       httpClient: options.httpClient ?? _config.httpClient,
-      method: 'GET',
       serializedBody: options.body as any,
     };
 
@@ -92,7 +91,7 @@ export const createClient = (config: Config = {}): Client => {
     const url = buildUrl(opts as any);
 
     const req = new HttpRequest<unknown>(
-      opts.method,
+      opts.method ?? 'GET',
       url,
       opts.serializedBody || null,
       {
@@ -126,26 +125,28 @@ export const createClient = (config: Config = {}): Client => {
       }
     }
 
-    let response;
-    const result = {
+    const result: {
+      request: HttpRequest<unknown>;
+      response: any;
+    } = {
       request: req,
-      response,
+      response: null,
     };
 
     try {
-      response = await firstValueFrom(
+      result.response = (await firstValueFrom(
         opts
           .httpClient!.request(req)
           .pipe(filter((event) => event.type === HttpEventType.Response)),
-      );
+      )) as HttpResponse<unknown>;
 
       for (const fn of interceptors.response._fns) {
         if (fn) {
-          response = await fn(response, req, opts as any);
+          result.response = await fn(result.response, req, opts as any);
         }
       }
 
-      let bodyResponse: any = response.body;
+      let bodyResponse = result.response.body;
 
       if (opts.responseValidator) {
         await opts.responseValidator(bodyResponse);
@@ -160,7 +161,7 @@ export const createClient = (config: Config = {}): Client => {
         : { data: bodyResponse, ...result };
     } catch (error) {
       if (error instanceof HttpErrorResponse) {
-        response = error;
+        result.response = error;
       }
 
       let finalError = error instanceof HttpErrorResponse ? error.error : error;
@@ -169,7 +170,7 @@ export const createClient = (config: Config = {}): Client => {
         if (fn) {
           finalError = (await fn(
             finalError,
-            response as HttpResponse<unknown>,
+            result.response as any,
             req,
             opts as any,
           )) as string;

package/dist/clients/nuxt/client.ts

@@ -65,7 +65,11 @@ export const createClient = (config: Config = {}): Client => {
           }
 
           if (requestValidator) {
-            await requestValidator(options);
+            await requestValidator({
+              ...options,
+              // @ts-expect-error
+              body: options.rawBody,
+            });
           }
         },
         ...opts.onRequest,
@@ -107,6 +111,7 @@ export const createClient = (config: Config = {}): Client => {
     }
 
     if (composable === 'useFetch' || composable === 'useLazyFetch') {
+      opts.rawBody = opts.body;
       const bodyParams = reactive({
         body: opts.body,
         bodySerializer: opts.bodySerializer,

package/dist/clients/nuxt/types.ts

@@ -72,6 +72,7 @@ export interface RequestOptions<
       body?: unknown;
       path?: FetchOptions<unknown>['query'];
       query?: FetchOptions<unknown>['query'];
+      rawBody?: unknown;
     }> {
   asyncDataOptions?: AsyncDataOptions<ResT, ResT, KeysOf<ResT>, DefaultT>;
   composable: TComposable;

package/dist/clients/nuxt/utils.ts

@@ -369,6 +369,7 @@ export const executeFetchFn = (
   fetchFn: Required<Config>['$fetch'],
 ) => {
   const unwrappedOpts = unwrapRefs(opts);
+  unwrappedOpts.rawBody = unwrappedOpts.body;
   unwrappedOpts.body = serializeBody(unwrappedOpts);
   return fetchFn(
     buildUrl(opts),