fixup! fix(angular): add request overloads based on observe property

orval-labs · Sep 19, 2024 · a76c24d · a76c24d
1 parent 6e3b1c5
commit a76c24d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/angular/src/index.ts b/packages/angular/src/index.ts
@@ -27,7 +27,7 @@ const ANGULAR_DEPENDENCIES: GeneratorDependency[] = [
       { name: 'HttpHeaders' },
       { name: 'HttpParams' },
       { name: 'HttpContext' },
-      { name: 'HttpResponse' },
+      { name: 'HttpResponse', alias: 'AngularHttpResponse' }, // alias to prevent naming conflict with msw
       { name: 'HttpEvent' },
     ],
     dependency: '@angular/common/http',
@@ -217,7 +217,7 @@ const generateImplementation = (
   const propsDefinition = toObjectString(props, 'definition');
   const overloads = isRequestOptions
     ? `${operationName}<TData = ${dataType}>(\n    ${propsDefinition} options?: Omit<HttpClientOptions, 'observe'> & { observe?: 'body' }\n  ): Observable<TData>;
-    ${operationName}<TData = ${dataType}>(\n    ${propsDefinition} options?: Omit<HttpClientOptions, 'observe'> & { observe?: 'response' }\n  ): Observable<HttpResponse<TData>>;
+    ${operationName}<TData = ${dataType}>(\n    ${propsDefinition} options?: Omit<HttpClientOptions, 'observe'> & { observe?: 'response' }\n  ): Observable<AngularHttpResponse<TData>>;
     ${operationName}<TData = ${dataType}>(\n    ${propsDefinition} options?: Omit<HttpClientOptions, 'observe'> & { observe?: 'events' }\n  ): Observable<HttpEvent<TData>>;`
     : '';
 

diff --git a/samples/angular-app/src/api/endpoints/pets/pets.service.ts b/samples/angular-app/src/api/endpoints/pets/pets.service.ts
@@ -10,7 +10,7 @@ import type {
   HttpEvent,
   HttpHeaders,
   HttpParams,
-  HttpResponse,
+  HttpResponse as AngularHttpResponse,
 } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
@@ -62,7 +62,7 @@ export class PetsService {
     createPetsBody: CreatePetsBody,
     version?: number,
     options?: Omit<HttpClientOptions, 'observe'> & { observe?: 'response' },
-  ): Observable<HttpResponse<TData>>;
+  ): Observable<AngularHttpResponse<TData>>;
   createPets<TData = void>(
     createPetsBody: CreatePetsBody,
     version?: number,
@@ -87,7 +87,7 @@ export class PetsService {
     petId: string,
     version?: number,
     options?: Omit<HttpClientOptions, 'observe'> & { observe?: 'response' },
-  ): Observable<HttpResponse<TData>>;
+  ): Observable<AngularHttpResponse<TData>>;
   showPetById<TData = Pet>(
     petId: string,
     version?: number,