From ae3314979797fe86d4870d2be33e597661cb5c8e Mon Sep 17 00:00:00 2001
From: Ferdi Koomen <info@madebyferdi.com>
Date: Tue, 25 Jan 2022 11:15:56 +0100
Subject: [PATCH] - Tested seperation of OpenAPI object, some small fixes

---
 src/templates/core/axios/request.hbs     | 2 +-
 src/templates/core/axios/sendRequest.hbs | 4 ++--
 src/templates/core/fetch/request.hbs     | 2 +-
 src/templates/core/node/request.hbs      | 2 +-
 src/templates/core/xhr/request.hbs       | 2 +-
 src/templates/index.hbs                  | 1 +
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/templates/core/axios/request.hbs b/src/templates/core/axios/request.hbs
index 12157e8e..755555bf 100644
--- a/src/templates/core/axios/request.hbs
+++ b/src/templates/core/axios/request.hbs
@@ -8,7 +8,7 @@ import type { ApiRequestOptions } from './ApiRequestOptions';
 import type { ApiResult } from './ApiResult';
 import { CancelablePromise } from './CancelablePromise';
 import type { OnCancel } from './CancelablePromise';
-import { OpenAPIConfig } from './OpenAPI';
+import type { OpenAPIConfig } from './OpenAPI';
 
 {{>functions/isDefined}}
 
diff --git a/src/templates/core/axios/sendRequest.hbs b/src/templates/core/axios/sendRequest.hbs
index 7813a9c2..f5c08e40 100644
--- a/src/templates/core/axios/sendRequest.hbs
+++ b/src/templates/core/axios/sendRequest.hbs
@@ -9,7 +9,7 @@ const sendRequest = async (
 ): Promise<AxiosResponse<any>> => {
 	const source = axios.CancelToken.source();
 
-	const config: AxiosRequestConfig = {
+	const requestConfig: AxiosRequestConfig = {
 		url,
 		headers,
 		data: body || formData,
@@ -21,7 +21,7 @@ const sendRequest = async (
 	onCancel(() => source.cancel('The user aborted a request.'));
 
 	try {
-		return await axios.request(config);
+		return await axios.request(requestConfig);
 	} catch (error) {
 		const axiosError = error as AxiosError;
 		if (axiosError.response) {
diff --git a/src/templates/core/fetch/request.hbs b/src/templates/core/fetch/request.hbs
index d89b7888..6116daed 100644
--- a/src/templates/core/fetch/request.hbs
+++ b/src/templates/core/fetch/request.hbs
@@ -5,7 +5,7 @@ import type { ApiRequestOptions } from './ApiRequestOptions';
 import type { ApiResult } from './ApiResult';
 import { CancelablePromise } from './CancelablePromise';
 import type { OnCancel } from './CancelablePromise';
-import { OpenAPIConfig } from './OpenAPI';
+import type { OpenAPIConfig } from './OpenAPI';
 
 {{>functions/isDefined}}
 
diff --git a/src/templates/core/node/request.hbs b/src/templates/core/node/request.hbs
index d8c738b5..367254d5 100644
--- a/src/templates/core/node/request.hbs
+++ b/src/templates/core/node/request.hbs
@@ -9,7 +9,7 @@ import type { ApiRequestOptions } from './ApiRequestOptions';
 import type { ApiResult } from './ApiResult';
 import { CancelablePromise } from './CancelablePromise';
 import type { OnCancel } from './CancelablePromise';
-import { OpenAPIConfig } from './OpenAPI';
+import type { OpenAPIConfig } from './OpenAPI';
 
 {{>functions/isDefined}}
 
diff --git a/src/templates/core/xhr/request.hbs b/src/templates/core/xhr/request.hbs
index 40aac34e..d9d32225 100644
--- a/src/templates/core/xhr/request.hbs
+++ b/src/templates/core/xhr/request.hbs
@@ -5,7 +5,7 @@ import type { ApiRequestOptions } from './ApiRequestOptions';
 import type { ApiResult } from './ApiResult';
 import { CancelablePromise } from './CancelablePromise';
 import type { OnCancel } from './CancelablePromise';
-import { OpenAPIConfig } from './OpenAPI';
+import type { OpenAPIConfig } from './OpenAPI';
 
 {{>functions/isDefined}}
 
diff --git a/src/templates/index.hbs b/src/templates/index.hbs
index 97355941..86a25715 100644
--- a/src/templates/index.hbs
+++ b/src/templates/index.hbs
@@ -4,6 +4,7 @@
 export { ApiError } from './core/ApiError';
 export { CancelablePromise, CancelError } from './core/CancelablePromise';
 export { OpenAPI } from './core/OpenAPI';
+export type { OpenAPIConfig } from './core/OpenAPI';
 {{/if}}
 {{#if @root.exportModels}}
 {{#if models}}