Fix case conversion for service operation response body

Author: OskarAsplin

src/Case.ts

@@ -1,12 +1,14 @@
 import { Enum } from './client/interfaces/Enum';
 import { Model } from './client/interfaces/Model';
+import { OperationResponse } from './client/interfaces/OperationResponse';
+import { Service } from './client/interfaces/Service';
 
 export enum Case {
     NONE = 'none',
     CAMEL = 'camel',
     SNAKE = 'snake',
 }
-// Convert a string from snake case or pascal case to camel case.
+// Convert a string from snake case to camel case.
 const toCamelCase = (str: string): string => {
     return str.replace(/_([a-z])/g, match => match[1].toUpperCase());
 };
@@ -23,7 +25,7 @@ const transforms = {
 
 // A recursive function that looks at the models and their properties and
 // converts each property name using the provided transform function.
-export const convertModelNames = (model: Model, type: Exclude<Case, Case.NONE>): Model => {
+export const convertModelNames = <T extends Model | OperationResponse>(model: T, type: Exclude<Case, Case.NONE>): T => {
     return {
         ...model,
         name: transforms[type](model.name),
@@ -40,3 +42,13 @@ const convertEnumName = (modelEnum: Enum, type: Exclude<Case, Case.NONE>): Enum
         name: transforms[type](modelEnum.name),
     };
 };
+
+export const convertServiceCase = (service: Service, type: Exclude<Case, Case.NONE>): Service => {
+    return {
+        ...service,
+        operations: service.operations.map(op => ({
+            ...op,
+            results: op.results.map(results => convertModelNames(results, type)),
+        })),
+    };
+};

src/utils/writeClient.ts

@@ -81,6 +81,7 @@ export const writeClient = async (
             useOptions,
             indent,
             postfixServices,
+            transformCase,
             clientName
         );
     }

src/utils/writeClientServices.spec.ts

@@ -1,6 +1,7 @@
 import { EOL } from 'os';
 import { resolve } from 'path';
 
+import { Case } from '../Case';
 import type { Service } from '../client/interfaces/Service';
 import { HttpClient } from '../HttpClient';
 import { Indent } from '../Indent';
@@ -40,7 +41,17 @@ describe('writeClientServices', () => {
             },
         };
 
-        await writeClientServices(services, templates, '/', HttpClient.FETCH, false, false, Indent.SPACE_4, 'Service');
+        await writeClientServices(
+            services,
+            templates,
+            '/',
+            HttpClient.FETCH,
+            false,
+            false,
+            Indent.SPACE_4,
+            'Service',
+            Case.NONE
+        );
 
         expect(writeFile).toBeCalledWith(resolve('/', '/UserService.ts'), `service${EOL}`);
     });

src/utils/writeClientServices.ts

@@ -1,5 +1,6 @@
 import { resolve } from 'path';
 
+import { Case, convertServiceCase } from '../Case';
 import type { Service } from '../client/interfaces/Service';
 import type { HttpClient } from '../HttpClient';
 import type { Indent } from '../Indent';
@@ -19,6 +20,7 @@ import type { Templates } from './registerHandlebarTemplates';
  * @param useOptions Use options or arguments functions
  * @param indent Indentation options (4, 2 or tab)
  * @param postfix Service name postfix
+ * @param transformCase Transform model case (camel, snake)
  * @param clientName Custom client class name
  */
 export const writeClientServices = async (
@@ -30,12 +32,14 @@ export const writeClientServices = async (
     useOptions: boolean,
     indent: Indent,
     postfix: string,
+    transformCase: Case,
     clientName?: string
 ): Promise<void> => {
     for (const service of services) {
+        const newService = transformCase === Case.NONE ? service : convertServiceCase(service, transformCase);
         const file = resolve(outputPath, `${service.name}${postfix}.ts`);
         const templateResult = templates.exports.service({
-            ...service,
+            ...newService,
             httpClient,
             useUnionTypes,
             useOptions,