Merge conflicts

Author: alexjennings

.gitignore

@@ -8,6 +8,7 @@ junit.xml
 .idea
 .vscode
 *.iml
+dist
 coverage
 test/generated
 test/e2e/generated

src/index.ts

@@ -141,8 +141,9 @@ export const generate = async ({
             useOptions,
             useUnionTypes,
             indent,
-            postfix,
-            serviceTemplate
+            postfixServices,
+            postfixModels,
+            serviceTemplate,
         );
     }
 };

src/utils/writeClient.ts

@@ -26,7 +26,6 @@ import { writeClientServices } from './writeClientServices';
  * @param exportServices Generate services
  * @param exportModels Generate models
  * @param exportSchemas Generate schemas
- * @param exportSchemas Generate schemas
  * @param indent Indentation options (4, 2 or tab)
  * @param postfixServices Service name postfix
  * @param postfixModels Model name postfix

src/utils/writeClientServicesCustomTemplate.ts

@@ -17,7 +17,8 @@ export const writeClientServicesCustomTemplate = async (
     useOptions: boolean,
     useUnionTypes: boolean,
     indent: Indent,
-    postfix: string,
+    postfixServices: string,
+    postfixModels: string,
     templatePath: string
 ) => {
     registerHandlebarTemplates({
@@ -37,14 +38,15 @@ export const writeClientServicesCustomTemplate = async (
     await mkdir(servicesDir);
 
     for (const service of client.services) {
-        const file = resolve(outputPath, `services/${service.name}${postfix}.ts`);
+        const file = resolve(outputPath, `services/${service.name}${postfixServices}.ts`);
         const templateResult = serviceTemplate({
             ...service,
             serviceBaseUrl: client.server,
             httpClient,
             useUnionTypes,
             useOptions,
-            postfix,
+            postfixServices,
+            postfixModels,
         });
         await writeFile(file, formatIndentation(formatCode(templateResult), indent));
     }