- Added e2e test

- Cleanup of new export client logic

Author: ferdikoomen

jest.config.ts

@@ -25,6 +25,11 @@ const config: Config.InitialOptions = {
                 '<rootDir>/test/e2e/v3.node.spec.ts',
                 '<rootDir>/test/e2e/v3.axios.spec.ts',
                 '<rootDir>/test/e2e/v3.babel.spec.ts',
+                '<rootDir>/test/e2e/client.fetch.spec.ts',
+                '<rootDir>/test/e2e/client.xhr.spec.ts',
+                '<rootDir>/test/e2e/client.node.spec.ts',
+                '<rootDir>/test/e2e/client.axios.spec.ts',
+                '<rootDir>/test/e2e/client.babel.spec.ts',
             ],
         },
     ],

src/openApi/v2/parser/getServices.spec.ts

@@ -26,6 +26,6 @@ describe('getServices', () => {
         });
 
         expect(services).toHaveLength(1);
-        expect(services[0].name).toEqual('');
+        expect(services[0].name).toEqual('Default');
     });
 });

src/openApi/v3/parser/getServices.spec.ts

@@ -26,6 +26,6 @@ describe('getServices', () => {
         });
 
         expect(services).toHaveLength(1);
-        expect(services[0].name).toEqual('');
+        expect(services[0].name).toEqual('Default');
     });
 });

src/templates/client.hbs

@@ -20,7 +20,7 @@ export class {{{clientName}}} {
 
 	private readonly request: BaseHttpRequest;
 
-	constructor(config?: OpenAPIConfig, HttpRequest: HttpRequestConstructor = {{{httpRequest}}}) {
+	constructor(config?: Partial<OpenAPIConfig>, HttpRequest: HttpRequestConstructor = {{{httpRequest}}}) {
 		this.request = new HttpRequest({
 			BASE: config?.BASE ?? '{{{server}}}',
 			VERSION: config?.VERSION ?? '{{{version}}}',

src/templates/index.hbs

@@ -1,7 +1,13 @@
 {{>header}}
-{{#if @root.exportCore}}
 
+{{#if @root.exportClient}}
+export { AppClient } from './client';
+{{/if}}
+{{#if @root.exportCore}}
 export { ApiError } from './core/ApiError';
+{{#if @root.exportClient}}
+export { BaseHttpRequest } from './core/BaseHttpRequest';
+{{/if}}
 export { CancelablePromise, CancelError } from './core/CancelablePromise';
 export { OpenAPI } from './core/OpenAPI';
 export type { OpenAPIConfig } from './core/OpenAPI';

src/utils/writeClient.ts

@@ -108,7 +108,8 @@ export const writeClient = async (
             exportServices,
             exportModels,
             exportSchemas,
-            postfix
+            postfix,
+            clientName
         );
     }
 };

src/utils/writeClientClass.spec.ts

@@ -1,7 +1,7 @@
 import type { Client } from '../client/interfaces/Client';
 import { HttpClient } from '../HttpClient';
 import { Indent } from '../Indent';
-import { mkdir, rmdir, writeFile } from './fileSystem';
+import { writeFile } from './fileSystem';
 import type { Templates } from './registerHandlebarTemplates';
 import { writeClientClass } from './writeClientClass';
 
@@ -38,8 +38,6 @@ describe('writeClientClass', () => {
 
         await writeClientClass(client, templates, './dist', HttpClient.FETCH, 'AppClient', Indent.SPACE_4, '');
 
-        expect(rmdir).toBeCalled();
-        expect(mkdir).toBeCalled();
         expect(writeFile).toBeCalled();
     });
 });

src/utils/writeClientIndex.ts

@@ -2,6 +2,7 @@ import { resolve } from 'path';
 
 import type { Client } from '../client/interfaces/Client';
 import { writeFile } from './fileSystem';
+import { isDefined } from './isDefined';
 import { Templates } from './registerHandlebarTemplates';
 import { sortModelsByName } from './sortModelsByName';
 import { sortServicesByName } from './sortServicesByName';
@@ -19,6 +20,7 @@ import { sortServicesByName } from './sortServicesByName';
  * @param exportModels Generate models
  * @param exportSchemas Generate schemas
  * @param postfix Service name postfix
+ * @param clientName Custom client class name
  */
 export const writeClientIndex = async (
     client: Client,
@@ -29,7 +31,8 @@ export const writeClientIndex = async (
     exportServices: boolean,
     exportModels: boolean,
     exportSchemas: boolean,
-    postfix: string
+    postfix: string,
+    clientName?: string
 ): Promise<void> => {
     const templateResult = templates.index({
         exportCore,
@@ -42,6 +45,7 @@ export const writeClientIndex = async (
         version: client.version,
         models: sortModelsByName(client.models),
         services: sortServicesByName(client.services),
+        exportClient: isDefined(clientName),
     });
 
     await writeFile(resolve(outputPath, 'index.ts'), templateResult);