chore: update example and test snapshots

Author: SukkaW

examples/openapi-ts-angular-common/src/client/client/client.gen.ts

@@ -122,25 +122,30 @@ export const createClient = (config: Config = {}): Client => {
   };
 
   const request: Client['request'] = async (options) => {
-    const { opts, req: initialReq } = await beforeRequest(options);
-
-    let req = initialReq;
-
-    for (const fn of interceptors.request.fns) {
-      if (fn) {
-        req = await fn(req, opts as any);
-      }
-    }
+    const throwOnError = options.throwOnError ?? _config.throwOnError;
+    const responseStyle = options.responseStyle ?? _config.responseStyle;
 
     const result: {
-      request: HttpRequest<unknown>;
+      request?: HttpRequest<unknown>;
       response: any;
     } = {
-      request: req,
+      request: undefined,
       response: null,
     };
 
     try {
+      const { opts, req: initialReq } = await beforeRequest(options);
+
+      let req = initialReq;
+      result.request = req;
+
+      for (const fn of interceptors.request.fns) {
+        if (fn) {
+          req = await fn(req, opts as any);
+          result.request = req;
+        }
+      }
+
       result.response = (await firstValueFrom(
         opts
           .httpClient!.request(req)
@@ -173,15 +178,20 @@ export const createClient = (config: Config = {}): Client => {
 
       for (const fn of interceptors.error.fns) {
         if (fn) {
-          finalError = (await fn(finalError, result.response as any, req, opts as any)) as string;
+          finalError = (await fn(
+            finalError,
+            result.response as any,
+            result.request,
+            options as any,
+          )) as string;
         }
       }
 
-      if (opts.throwOnError) {
+      if (throwOnError) {
         throw finalError;
       }
 
-      return opts.responseStyle === 'data'
+      return responseStyle === 'data'
         ? undefined
         : {
             error: finalError,

examples/openapi-ts-angular-common/src/client/client/types.gen.ts

@@ -129,7 +129,8 @@ export type RequestResult<
           | {
               data: undefined;
               error: TError[keyof TError];
-              request: HttpRequest<unknown>;
+              /** request may be undefined, because error may be from building the request object itself */
+              request?: HttpRequest<unknown>;
               response: HttpErrorResponse & {
                 error: TError[keyof TError] | null;
               };

examples/openapi-ts-angular-common/src/client/client/utils.gen.ts

@@ -312,7 +312,8 @@ export const mergeHeaders = (
 type ErrInterceptor<Err, Res, Req, Options> = (
   error: Err,
   response: Res,
-  request: Req,
+  /** request may be undefined, because error may be from building the request object itself */
+  request: Req | undefined,
   options: Options,
 ) => Err | Promise<Err>;
 

examples/openapi-ts-angular/src/client/client/client.gen.ts

@@ -122,25 +122,30 @@ export const createClient = (config: Config = {}): Client => {
   };
 
   const request: Client['request'] = async (options) => {
-    const { opts, req: initialReq } = await beforeRequest(options);
-
-    let req = initialReq;
-
-    for (const fn of interceptors.request.fns) {
-      if (fn) {
-        req = await fn(req, opts as any);
-      }
-    }
+    const throwOnError = options.throwOnError ?? _config.throwOnError;
+    const responseStyle = options.responseStyle ?? _config.responseStyle;
 
     const result: {
-      request: HttpRequest<unknown>;
+      request?: HttpRequest<unknown>;
       response: any;
     } = {
-      request: req,
+      request: undefined,
       response: null,
     };
 
     try {
+      const { opts, req: initialReq } = await beforeRequest(options);
+
+      let req = initialReq;
+      result.request = req;
+
+      for (const fn of interceptors.request.fns) {
+        if (fn) {
+          req = await fn(req, opts as any);
+          result.request = req;
+        }
+      }
+
       result.response = (await firstValueFrom(
         opts
           .httpClient!.request(req)
@@ -173,15 +178,20 @@ export const createClient = (config: Config = {}): Client => {
 
       for (const fn of interceptors.error.fns) {
         if (fn) {
-          finalError = (await fn(finalError, result.response as any, req, opts as any)) as string;
+          finalError = (await fn(
+            finalError,
+            result.response as any,
+            result.request,
+            options as any,
+          )) as string;
         }
       }
 
-      if (opts.throwOnError) {
+      if (throwOnError) {
         throw finalError;
       }
 
-      return opts.responseStyle === 'data'
+      return responseStyle === 'data'
         ? undefined
         : {
             error: finalError,

examples/openapi-ts-angular/src/client/client/types.gen.ts

@@ -129,7 +129,8 @@ export type RequestResult<
           | {
               data: undefined;
               error: TError[keyof TError];
-              request: HttpRequest<unknown>;
+              /** request may be undefined, because error may be from building the request object itself */
+              request?: HttpRequest<unknown>;
               response: HttpErrorResponse & {
                 error: TError[keyof TError] | null;
               };

examples/openapi-ts-angular/src/client/client/utils.gen.ts

@@ -312,7 +312,8 @@ export const mergeHeaders = (
 type ErrInterceptor<Err, Res, Req, Options> = (
   error: Err,
   response: Res,
-  request: Req,
+  /** request may be undefined, because error may be from building the request object itself */
+  request: Req | undefined,
   options: Options,
 ) => Err | Promise<Err>;