PE-2152 - add multiple http clients

Author: lub0v-parsable

.gitignore

@@ -15,3 +15,4 @@ test/e2e/generated
 samples/generated
 samples/swagger-codegen-cli-v2.jar
 samples/swagger-codegen-cli-v3.jar
+example

package.json

@@ -1,6 +1,6 @@
 {
-    "name": "openapi-typescript-codegen",
-    "version": "0.9.3",
+    "name": "@parsable/openapi-typescript-codegen",
+    "version": "0.0.1-alpha-2",
     "description": "Library that generates Typescript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",
     "homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",

src/templates/core/ConcreteHttpRequest.hbs renamed to src/templates/core/request.hbs

@@ -16,7 +16,7 @@ describe('registerHandlebarTemplates', () => {
         expect(templates.core.apiError).toBeDefined();
         expect(templates.core.apiRequestOptions).toBeDefined();
         expect(templates.core.apiResult).toBeDefined();
-        expect(templates.core.concreteHttpRequest).toBeDefined();
+        expect(templates.core.request).toBeDefined();
         expect(templates.core.baseHttpRequest).toBeDefined();
         expect(templates.client).toBeDefined();
     });

src/utils/registerHandlebarTemplates.spec.ts

@@ -5,7 +5,6 @@ import templateCoreApiError from '../templates/core/ApiError.hbs';
 import templateCoreApiRequestOptions from '../templates/core/ApiRequestOptions.hbs';
 import templateCoreApiResult from '../templates/core/ApiResult.hbs';
 import templateCoreBaseHttpClient from '../templates/core/BaseHttpRequest.hbs';
-import templateCoreConcreteHttpClient from '../templates/core/ConcreteHttpRequest.hbs';
 import fetchGetHeaders from '../templates/core/fetch/getHeaders.hbs';
 import fetchGetRequestBody from '../templates/core/fetch/getRequestBody.hbs';
 import fetchGetResponseBody from '../templates/core/fetch/getResponseBody.hbs';
@@ -30,6 +29,7 @@ import nodeGetResponseHeader from '../templates/core/node/getResponseHeader.hbs'
 import nodeRequest from '../templates/core/node/request.hbs';
 import nodeSendRequest from '../templates/core/node/sendRequest.hbs';
 import templateCoreSettings from '../templates/core/OpenAPI.hbs';
+import templateCoreRequest from '../templates/core/request.hbs';
 import xhrGetHeaders from '../templates/core/xhr/getHeaders.hbs';
 import xhrGetRequestBody from '../templates/core/xhr/getRequestBody.hbs';
 import xhrGetResponseBody from '../templates/core/xhr/getResponseBody.hbs';
@@ -84,7 +84,12 @@ export interface Templates {
         apiRequestOptions: Handlebars.TemplateDelegate;
         apiResult: Handlebars.TemplateDelegate;
         baseHttpRequest: Handlebars.TemplateDelegate;
-        concreteHttpRequest: Handlebars.TemplateDelegate;
+        request: Handlebars.TemplateDelegate;
+        httpRequest: {
+            fetch: Handlebars.TemplateDelegate;
+            node: Handlebars.TemplateDelegate;
+            xhr: Handlebars.TemplateDelegate;
+        };
     };
 }
 
@@ -110,7 +115,12 @@ export function registerHandlebarTemplates(root: { httpClient: HttpClient; useOp
             apiRequestOptions: Handlebars.template(templateCoreApiRequestOptions),
             apiResult: Handlebars.template(templateCoreApiResult),
             baseHttpRequest: Handlebars.template(templateCoreBaseHttpClient),
-            concreteHttpRequest: Handlebars.template(templateCoreConcreteHttpClient),
+            request: Handlebars.template(templateCoreRequest),
+            httpRequest: {
+                fetch: Handlebars.template(fetchRequest),
+                node: Handlebars.template(nodeRequest),
+                xhr: Handlebars.template(xhrRequest),
+            },
         },
     };
 

src/utils/registerHandlebarTemplates.ts

@@ -29,7 +29,12 @@ describe('writeAppClient', () => {
                 apiRequestOptions: () => 'apiRequestOptions',
                 apiResult: () => 'apiResult',
                 baseHttpRequest: () => 'baseHttpRequest',
-                concreteHttpRequest: () => 'concreteHttpRequest',
+                request: () => 'concreteHttpRequest',
+                httpRequest: {
+                    fetch: () => 'fetchRequest',
+                    node: () => 'nodeRequest',
+                    xhr: () => 'xhrRequest',
+                },
             },
         };
 

src/utils/writeAppClient.spec.ts

@@ -29,7 +29,7 @@ describe('writeClient', () => {
                 apiRequestOptions: () => 'apiRequestOptions',
                 apiResult: () => 'apiResult',
                 baseHttpRequest: () => 'baseHttpRequest',
-                concreteHttpRequest: () => 'concreteHttpRequest',
+                request: () => 'concreteHttpRequest',
             },
         };
 

src/utils/writeClient.spec.ts

@@ -28,7 +28,12 @@ describe('writeClientCore', () => {
             apiRequestOptions: () => 'apiRequestOptions',
             apiResult: () => 'apiResult',
             baseHttpRequest: () => 'baseHttpRequest',
-            concreteHttpRequest: () => 'concreteHttpRequest',
+            request: () => 'request',
+            httpRequest: {
+                fetch: () => 'fetchRequest',
+                node: () => 'nodeRequest',
+                xhr: () => 'xhrRequest',
+            },
         },
     };
 
@@ -39,7 +44,7 @@ describe('writeClientCore', () => {
         expect(writeFile).toBeCalledWith('/ApiError.ts', 'apiError');
         expect(writeFile).toBeCalledWith('/ApiRequestOptions.ts', 'apiRequestOptions');
         expect(writeFile).toBeCalledWith('/ApiResult.ts', 'apiResult');
-        expect(writeFile).toBeCalledWith('/request.ts', 'concreteHttpRequest');
+        expect(writeFile).toBeCalledWith('/request.ts', 'request');
     });
 
     it('should write to filesystem when exportClient true', async () => {
@@ -50,6 +55,8 @@ describe('writeClientCore', () => {
         expect(writeFile).toBeCalledWith('/ApiRequestOptions.ts', 'apiRequestOptions');
         expect(writeFile).toBeCalledWith('/ApiResult.ts', 'apiResult');
         expect(writeFile).toBeCalledWith('/BaseHttpRequest.ts', 'baseHttpRequest');
-        expect(writeFile).toBeCalledWith('/FetchHttpRequest.ts', 'concreteHttpRequest');
+        expect(writeFile).toBeCalledWith('/FetchHttpRequest.ts', 'fetchRequest');
+        expect(writeFile).toBeCalledWith('/NodeHttpRequest.ts', 'nodeRequest');
+        expect(writeFile).toBeCalledWith('/XhrHttpRequest.ts', 'xhrRequest');
     });
 });

src/utils/writeClientCore.spec.ts

@@ -29,9 +29,11 @@ export async function writeClientCore(client: Client, templates: Templates, outp
     await writeFile(resolve(outputPath, 'ApiResult.ts'), templates.core.apiResult({}));
     if (exportClient) {
         await writeFile(resolve(outputPath, 'BaseHttpRequest.ts'), templates.core.baseHttpRequest({}));
-        await writeFile(resolve(outputPath, `${getHttpRequestName(httpClient)}.ts`), templates.core.concreteHttpRequest(context));
+        for (const client of Object.values(HttpClient)) {
+            await writeFile(resolve(outputPath, `${getHttpRequestName(client)}.ts`), templates.core.httpRequest[client](context));
+        }
     } else {
-        await writeFile(resolve(outputPath, `request.ts`), templates.core.concreteHttpRequest(context));
+        await writeFile(resolve(outputPath, `request.ts`), templates.core.request(context));
     }
 
     if (request) {

src/utils/writeClientCore.ts

@@ -29,7 +29,12 @@ describe('writeClientIndex', () => {
                 apiRequestOptions: () => 'apiRequestOptions',
                 apiResult: () => 'apiResult',
                 baseHttpRequest: () => 'baseHttpClient',
-                concreteHttpRequest: () => 'concreteHttpClient',
+                request: () => 'request',
+                httpRequest: {
+                    fetch: () => 'fetchRequest',
+                    node: () => 'nodeRequest',
+                    xhr: () => 'xhrRequest',
+                },
             },
         };