Fixed bug

Author: Запасной Александр Сергеевич

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sundved/openapi-typescript-codegen",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Fork of library that generates Typescript clients based on the OpenAPI specification.",
   "author": "Sundved",
   "homepage": "https://github.com/Sundved/openapi-typescript-codegen",

src/templates/core/httpClient/request.hbs

@@ -1,4 +1,6 @@
 {{>header}}
+
+import { DELETE, GET, POST, PUT } from '{{{httpClientLibrary}}}';
 import type { ApiRequestOptions } from './ApiRequestOptions';
 import { OpenAPI } from './OpenAPI';
 

src/templates/core/httpClient/sendRequest.hbs

@@ -1,5 +1,3 @@
-import {DELETE, GET, POST, PUT} from '{{>httpClientLibrary}}';
-
 async function sendRequest(options: ApiRequestOptions, url: string): Promise<any> {
 
     switch (options.method) {

src/utils/writeClient.ts

@@ -51,13 +51,13 @@ export async function writeClient(
     if (exportCore) {
         await rmdir(outputPathCore);
         await mkdir(outputPathCore);
-        await writeClientCore(client, templates, outputPathCore, httpClient);
+        await writeClientCore(client, templates, outputPathCore, httpClient, httpClientLibrary);
     }
 
     if (exportServices) {
         await rmdir(outputPathServices);
         await mkdir(outputPathServices);
-        await writeClientServices(client.services, templates, outputPathServices, httpClient, useUnionTypes, useOptions, httpClientLibrary);
+        await writeClientServices(client.services, templates, outputPathServices, httpClient, useUnionTypes, useOptions);
     }
 
     if (exportSchemas) {

src/utils/writeClientCore.ts

@@ -11,10 +11,12 @@ import { Templates } from './registerHandlebarTemplates';
  * @param templates The loaded handlebar templates
  * @param outputPath Directory to write the generated files to
  * @param httpClient The selected httpClient (fetch, xhr or node)
+ * @param httpClientLibrary Library for httpClient
  */
-export async function writeClientCore(client: Client, templates: Templates, outputPath: string, httpClient: HttpClient): Promise<void> {
+export async function writeClientCore(client: Client, templates: Templates, outputPath: string, httpClient: HttpClient, httpClientLibrary: string): Promise<void> {
     const context = {
         httpClient,
+        httpClientLibrary,
         server: client.server,
         version: client.version,
     };

src/utils/writeClientServices.ts

@@ -16,17 +16,8 @@ const VERSION_TEMPLATE_STRING = 'OpenAPI.VERSION';
  * @param httpClient The selected httpClient (fetch, xhr or node)
  * @param useUnionTypes Use union types instead of enums
  * @param useOptions Use options or arguments functions
- * @param httpClientLibrary Library for httpClient
  */
-export async function writeClientServices(
-    services: Service[],
-    templates: Templates,
-    outputPath: string,
-    httpClient: HttpClient,
-    useUnionTypes: boolean,
-    useOptions: boolean,
-    httpClientLibrary: string
-): Promise<void> {
+export async function writeClientServices(services: Service[], templates: Templates, outputPath: string, httpClient: HttpClient, useUnionTypes: boolean, useOptions: boolean): Promise<void> {
     for (const service of services) {
         const file = path.resolve(outputPath, `${service.name}.ts`);
         const useVersion = service.operations.some(operation => operation.path.includes(VERSION_TEMPLATE_STRING));
@@ -36,7 +27,6 @@ export async function writeClientServices(
             useUnionTypes,
             useVersion,
             useOptions,
-            httpClientLibrary,
         });
         await writeFile(file, format(templateResult));
     }