feat(exportService): infer return type instead from possible custom request file

Author: A.K Sahin

bin/index.js

@@ -28,21 +28,21 @@ const params = program
 const OpenAPI = require(path.resolve(__dirname, '../dist/index.js'));
 
 const genereteParams = {
-    input: program.input,
-    output: program.output,
-    httpClient: program.client,
-    useOptions: program.useOptions,
-    useUnionTypes: program.useUnionTypes,
-    exportCore: JSON.parse(program.exportCore) === true,
-    exportServices: JSON.parse(program.exportServices) === true,
-    exportModels: JSON.parse(program.exportModels) === true,
-    exportSchemas: JSON.parse(program.exportSchemas) === true,
+    input: params.input,
+    output: params.output,
+    httpClient: params.client,
+    useOptions: params.useOptions,
+    useUnionTypes: params.useUnionTypes,
+    exportCore: JSON.parse(params.exportCore) === true,
+    exportServices: JSON.parse(params.exportServices) === true,
+    exportModels: JSON.parse(params.exportModels) === true,
+    exportSchemas: JSON.parse(params.exportSchemas) === true,
     postfix: params.postfix,
     request: params.request,
 };
 
-if (program.serviceOptions) {
-    genereteParams.serviceOptions = require(path.resolve(__dirname, '../../', program.serviceOptions));
+if (params.serviceOptions) {
+    genereteParams.serviceOptions = require(resolve(process.cwd(), params.serviceOptions));
 }
 
 if (OpenAPI) {

src/templates/exportService.hbs

@@ -45,8 +45,8 @@ export class {{{name}}}{{{@root.postfix}}} {
     {{/each}}
      * @throws ApiError
      */
-    public{{#if @root.staticMethods}} static{{/if}} {{{name}}}({{>parameters}}): CancelablePromise<{{>result}}> {
-        return __request({
+    public{{#if @root.staticMethods}} static{{/if}} {{{name}}}({{>parameters}}) {
+        return __request<{{>result}}>({
             method: '{{{method}}}',
             path: `{{{path}}}`,
             {{#if parametersCookie}}

src/utils/writeClient.spec.ts

@@ -32,7 +32,7 @@ describe('writeClient', () => {
             },
         };
 
-        await writeClient(client, templates, './dist', HttpClient.FETCH, false, false, true, true, true, true, '');
+        await writeClient(client, templates, './dist', HttpClient.FETCH, false, false, true, true, true, true, '', {});
 
         expect(rmdir).toBeCalled();
         expect(mkdir).toBeCalled();

src/utils/writeClientServices.spec.ts

@@ -33,7 +33,7 @@ describe('writeClientServices', () => {
             },
         };
 
-        await writeClientServices(services, templates, '/', HttpClient.FETCH, false, false, 'Service');
+        await writeClientServices(services, templates, '/', HttpClient.FETCH, false, false, 'Service', {});
 
         expect(writeFile).toBeCalledWith('/UserService.ts', 'service');
     });

src/utils/writeClientServices.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'path';
-import { ServiceOptions } from '..';
 
+import { ServiceOptions } from '..';
 import type { Service } from '../client/interfaces/Service';
 import { HttpClient } from '../HttpClient';
 import { writeFile } from './fileSystem';