feat: Add postfixModels to generate function & rename postfix to postfixServices

Author: markbrockhoff

src/index.ts

@@ -24,7 +24,12 @@ export type Options = {
     exportModels?: boolean;
     exportSchemas?: boolean;
     indent?: Indent;
+    /**
+     * @deprecated use postfixServices instead
+     */
     postfix?: string;
+    postfixServices?: string;
+    postfixModels?: string;
     request?: string;
     write?: boolean;
 };
@@ -44,7 +49,9 @@ export type Options = {
  * @param exportModels Generate models
  * @param exportSchemas Generate schemas
  * @param indent Indentation options (4, 2 or tab)
- * @param postfix Service name postfix
+ * @param postfix Deprecated: Param to support old parameter postfix, use postfixServices instead
+ * @param postfixServices Service name postfix
+ * @param postfixModels Model name postfix
  * @param request Path to custom request file
  * @param write Write the files to disk (true or false)
  */
@@ -60,7 +67,9 @@ export const generate = async ({
     exportModels = true,
     exportSchemas = false,
     indent = Indent.SPACE_4,
-    postfix = 'Service',
+    postfix,
+    postfixServices = 'Service',
+    postfixModels = '',
     request,
     write = true,
 }: Options): Promise<void> => {
@@ -89,7 +98,8 @@ export const generate = async ({
                 exportModels,
                 exportSchemas,
                 indent,
-                postfix,
+                postfix ?? postfixServices,
+                postfixModels,
                 clientName,
                 request
             );
@@ -112,7 +122,8 @@ export const generate = async ({
                 exportModels,
                 exportSchemas,
                 indent,
-                postfix,
+                postfix ?? postfixServices,
+                postfixModels,
                 clientName,
                 request
             );

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}}}';
+export type { {{{name}}} as {{{name}}}{{{@root.postfixModels}}} } from './models/{{{name}}}';
 {{else if enum}}
-export { {{{name}}} } from './models/{{{name}}}';
+export { {{{name}}} as {{{name}}}{{{@root.postfixModels}}} } from './models/{{{name}}}';
 {{else if enums}}
-export { {{{name}}} } from './models/{{{name}}}';
+export { {{{name}}} as {{{name}}}{{{@root.postfixModels}}} } from './models/{{{name}}}';
 {{else}}
-export type { {{{name}}} } from './models/{{{name}}}';
+export type { {{{name}}} as {{{name}}}{{{@root.postfixModels}}} } from './models/{{{name}}}';
 {{/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}}}';
+export { {{{name}}}{{{@root.postfixServices}}} } from './services/{{{name}}}{{{@root.postfixServices}}}';
 {{/each}}
 {{/if}}
 {{/if}}

src/utils/writeClient.ts

@@ -28,7 +28,8 @@ import { writeClientServices } from './writeClientServices';
  * @param exportSchemas Generate schemas
  * @param exportSchemas Generate schemas
  * @param indent Indentation options (4, 2 or tab)
- * @param postfix Service name postfix
+ * @param postfixServices Service name postfix
+ * @param postfixModels Model name postfix
  * @param clientName Custom client class name
  * @param request Path to custom request file
  */
@@ -44,7 +45,8 @@ export const writeClient = async (
     exportModels: boolean,
     exportSchemas: boolean,
     indent: Indent,
-    postfix: string,
+    postfixServices: string,
+    postfixModels: string,
     clientName?: string,
     request?: string
 ): Promise<void> => {
@@ -75,7 +77,7 @@ export const writeClient = async (
             useUnionTypes,
             useOptions,
             indent,
-            postfix,
+            postfixServices,
             clientName
         );
     }
@@ -94,7 +96,7 @@ export const writeClient = async (
 
     if (isDefined(clientName)) {
         await mkdir(outputPath);
-        await writeClientClass(client, templates, outputPath, httpClient, clientName, indent, postfix);
+        await writeClientClass(client, templates, outputPath, httpClient, clientName, indent, postfixServices);
     }
 
     if (exportCore || exportServices || exportSchemas || exportModels) {
@@ -108,7 +110,8 @@ export const writeClient = async (
             exportServices,
             exportModels,
             exportSchemas,
-            postfix,
+            postfixServices,
+            postfixModels,
             clientName
         );
     }

src/utils/writeClientIndex.spec.ts

@@ -34,7 +34,7 @@ describe('writeClientIndex', () => {
             },
         };
 
-        await writeClientIndex(client, templates, '/', true, true, true, true, true, 'Service');
+        await writeClientIndex(client, templates, '/', true, true, true, true, true, 'Service', '');
 
         expect(writeFile).toBeCalledWith('/index.ts', 'index');
     });

src/utils/writeClientIndex.ts

@@ -19,7 +19,8 @@ import { sortServicesByName } from './sortServicesByName';
  * @param exportServices Generate services
  * @param exportModels Generate models
  * @param exportSchemas Generate schemas
- * @param postfix Service name postfix
+ * @param postfixServices Service name postfix
+ * @param postfixModels Model name postfix
  * @param clientName Custom client class name
  */
 export const writeClientIndex = async (
@@ -31,7 +32,8 @@ export const writeClientIndex = async (
     exportServices: boolean,
     exportModels: boolean,
     exportSchemas: boolean,
-    postfix: string,
+    postfixServices: string,
+    postfixModels: string,
     clientName?: string
 ): Promise<void> => {
     const templateResult = templates.index({
@@ -40,7 +42,8 @@ export const writeClientIndex = async (
         exportModels,
         exportSchemas,
         useUnionTypes,
-        postfix,
+        postfixServices,
+        postfixModels,
         clientName,
         server: client.server,
         version: client.version,