feat: add different services & refactor ability to add .service .models extensions

Author: romantech48

src/HttpClient.ts

@@ -4,4 +4,5 @@ export enum HttpClient {
     NODE = 'node',
     AXIOS = 'axios',
     ANGULAR = 'angular',
+    SADDLEBACK = 'saddleback',
 }

src/generate.ts

@@ -24,7 +24,8 @@ export type Options = {
     postfix?: string;
     request?: string;
     write?: boolean;
-    exportModelsFileExtension?: string;
+    additionalModelFileExtension?: boolean;
+    additionalServiceFileExtension?: boolean;
 };
 /**
  * Generate the OpenAPI client. This method will read the OpenAPI specification and based on the
@@ -44,7 +45,8 @@ export type Options = {
  * @param postfix Service name postfix
  * @param request Path to custom request file
  * @param write Write the files to disk (true or false)
- * @param exportModelsFileExtension File extension for models .ts as default
+ * @param additionalModelFileExtension Add file extension for models *.models.*
+ * @param additionalServiceFileExtension Add file extension for service *.service.*
  */
 export const generate = async ({
     input,
@@ -61,6 +63,8 @@ export const generate = async ({
     postfix = 'Service',
     request,
     write = true,
+    additionalModelFileExtension = false,
+    additionalServiceFileExtension = false,
 }: Options): Promise<void> => {
     const openApi = isString(input) ? await getOpenApiSpec(input) : input;
     const openApiVersion = getOpenApiVersion(openApi);
@@ -88,6 +92,8 @@ export const generate = async ({
                 exportSchemas,
                 indent,
                 postfix,
+                additionalModelFileExtension,
+                additionalServiceFileExtension,
                 clientName,
                 request
             );
@@ -111,6 +117,8 @@ export const generate = async ({
                 exportSchemas,
                 indent,
                 postfix,
+                additionalModelFileExtension,
+                additionalServiceFileExtension,
                 clientName,
                 request
             );

src/generateCustomSpec.ts

@@ -13,6 +13,8 @@ type Config = Options & {
     filterArray: string[];
     input: string;
     useSaddlebackServices?: boolean;
+    additionalModelFileExtension?: boolean;
+    additionalServiceFileExtension?: boolean;
 };
 
 export const generateCustomSpec = async (config: Config) => {

src/templates/client.hbs

@@ -16,7 +16,7 @@ import { {{{httpRequest}}} } from './core/{{{httpRequest}}}';
 
 {{#if services}}
 {{#each services}}
-import { {{{name}}}{{{@root.postfix}}} } from './services/{{{name}}}{{{@root.postfix}}}.service';
+import { {{{name}}}{{{@root.postfix}}} } from './services/{{{name}}}{{{@root.postfix}}}{{#if ../additionalServiceFileExtension}}.service{{/if}}';
 {{/each}}
 {{/if}}
 

src/templates/exportModel.hbs

@@ -3,7 +3,7 @@
 {{#if imports}}
 
 {{#each imports}}
-import type { {{{this}}} } from './{{{this}}}.models';
+import type { {{{this}}} } from './{{{this}}}{{#if ../additionalModelFileExtension}}.models{{/if}}';
 {{/each}}
 {{/if}}
 

src/templates/exportSaddlebackService.hbs

@@ -1,6 +1,6 @@
 {{#if imports}}
 {{#each imports}}
-import type { {{{this}}} } from '../models/{{{this}}}.models';
+import type { {{{this}}} } from '../models/{{{this}}}{{#if ../additionalModelFileExtension}}.models{{/if}}';
 {{/each}}
 {{/if}}
 import axios, {

src/templates/exportService.hbs

@@ -13,7 +13,7 @@ import type { Observable } from 'rxjs';
 {{/equals}}
 {{#if imports}}
 {{#each imports}}
-import type { {{{this}}} } from '../models/{{{this}}}.models';
+import type { {{{this}}} } from '../models/{{{this}}}{{#if ../additionalModelFileExtension}}.models{{/if}}';
 {{/each}}
 
 {{/if}}

src/templates/index.hbs

@@ -18,13 +18,13 @@ export type { OpenAPIConfig } from './core/OpenAPI';
 
 {{#each models}}
 {{#if @root.useUnionTypes}}
-export type { {{{name}}} } from './models/{{{name}}}.models';
+export type { {{{name}}} } from './models/{{{name}}}{{#if ../additionalModelFileExtension}}.models{{/if}}';
 {{else if enum}}
-export { {{{name}}} } from './models/{{{name}}}.models';
+export { {{{name}}} } from './models/{{{name}}}{{#if ../additionalModelFileExtension}}.models{{/if}}';
 {{else if enums}}
-export { {{{name}}} } from './models/{{{name}}}.models';
+export { {{{name}}} } from './models/{{{name}}}{{#if ../additionalModelFileExtension}}.models{{/if}}';
 {{else}}
-export type { {{{name}}} } from './models/{{{name}}}.models';
+export type { {{{name}}} } from './models/{{{name}}}{{#if ../additionalModelFileExtension}}.models{{/if}}';
 {{/if}}
 {{/each}}
 {{/if}}
@@ -41,7 +41,7 @@ export { ${{{name}}} } from './schemas/${{{name}}}';
 {{#if services}}
 
 {{#each services}}
-export { {{{name}}}{{{@root.postfix}}} } from './services/{{{name}}}{{{@root.postfix}}}.service';
+export { {{{name}}}{{{@root.postfix}}} } from './services/{{{name}}}{{{@root.postfix}}}{{#if ../additionalServiceFileExtension}}.service{{/if}}';
 {{/each}}
 {{/if}}
 {{/if}}

src/utils/getHttpRequestName.ts

@@ -16,5 +16,7 @@ export const getHttpRequestName = (httpClient: HttpClient): string => {
             return 'AxiosHttpRequest';
         case HttpClient.ANGULAR:
             return 'AngularHttpRequest';
+        case HttpClient.SADDLEBACK:
+            return 'AxiosHttpRequest';
     }
 };

src/utils/writeClient.spec.ts

@@ -50,6 +50,8 @@ describe('writeClient', () => {
             true,
             Indent.SPACE_4,
             'Service',
+            false,
+            false,
             'AppClient'
         );