change the request generation for axios

Author: gergan

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-openapi-codegen",
-    "version": "0.24.0",
+    "version": "0.2.0",
     "description": "Library that generates Typescript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",
     "homepage": "https://github.com/essquare/typescript-openapi-codegen",
@@ -95,7 +95,8 @@
         "@typescript-eslint/eslint-plugin": "5.36.2",
         "@typescript-eslint/parser": "5.37.0",
         "abort-controller": "3.0.0",
-        "axios": "0.27.2",
+        "axios": "^1.1.3",
+        "bson": "^4.7.0",
         "codecov": "3.8.3",
         "cross-spawn": "7.0.3",
         "eslint": "8.23.1",

package.json

@@ -11,6 +11,15 @@ import type { ApiRequestOptions } from './ApiRequestOptions';
 import type { ApiResult } from './ApiResult';
 import type { OpenAPIConfig } from './OpenAPI';
 
+{{>functions/isBrowserEnv}}
+
+
+{{>functions/typeOfTest}}
+
+
+{{>functions/isFunction}}
+
+
 {{>functions/isDefined}}
 
 

src/templates/core/angular/request.hbs

@@ -1,9 +1,12 @@
-const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions, formData?: FormData): Promise<Record<string, string>> => {
+const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions, formData?: any): Promise<Record<string, string>> => {
 	const token = await resolve(options, config.TOKEN);
 	const username = await resolve(options, config.USERNAME);
 	const password = await resolve(options, config.PASSWORD);
 	const additionalHeaders = await resolve(options, config.HEADERS);
-	const formHeaders = typeof formData?.getHeaders === 'function' && formData?.getHeaders() || {}
+    const formHeaders = 
+        (isFormData(formData) && typeof formData?.getHeaders === 'function' && formData?.getHeaders()) ||
+        (isBlob(formData) && {'Content-Type': formData.type}) ||
+        {};
 
 	const headers = Object.entries({
 		Accept: 'application/json',

src/templates/core/axios/getHeaders.hbs

@@ -1,8 +1,8 @@
 {{>header}}
 
 import axios from 'axios';
-import type { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
-import FormData from 'form-data';
+import type { AxiosError, AxiosRequestConfig, AxiosResponse, AxiosResponseTransformer } from 'axios';
+import { ObjectId } from 'bson';
 
 import { ApiError } from './ApiError';
 import type { ApiRequestOptions } from './ApiRequestOptions';
@@ -11,6 +11,18 @@ import { CancelablePromise } from './CancelablePromise';
 import type { OnCancel } from './CancelablePromise';
 import type { OpenAPIConfig } from './OpenAPI';
 
+{{>functions/isBrowserEnv}}
+
+
+{{>functions/prepareFormData}}
+
+
+{{>functions/typeOfTest}}
+
+
+{{>functions/isFunction}}
+
+
 {{>functions/isDefined}}
 
 
@@ -73,7 +85,7 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): C
 	return new CancelablePromise(async (resolve, reject, onCancel) => {
 		try {
 			const url = getUrl(config, options);
-			const formData = getFormData(options);
+			const formData = prepareFormData(getFormData(options));
 			const body = getRequestBody(options);
 			const headers = await getHeaders(config, options, formData);
 

src/templates/core/axios/request.hbs

@@ -3,19 +3,56 @@ const sendRequest = async <T>(
 	options: ApiRequestOptions,
 	url: string,
 	body: any,
-	formData: FormData | undefined,
+	formData: any,
 	headers: Record<string, string>,
 	onCancel: OnCancel
 ): Promise<AxiosResponse<T>> => {
 	const source = axios.CancelToken.source();
+    let realBody;
+    if (body) {
+        realBody = body;
+    } else if (isFormData(formData)) {
+        realBody = formData;
+    }
+    if (isBlob(formData)) {
+        realBody = await formData.arrayBuffer();
+    }
+
+    const transformers: AxiosResponseTransformer[] = [];
+
+    transformers.push(function binaryData(data, headers) {
+        const contentType = (headers.getContentType() as string) || '';
+        const hasJSONContentType = contentType.indexOf('application/json') > -1;
+        const hasTextContentType = contentType.indexOf('text/plain') > -1;
+        if (!hasJSONContentType && !hasTextContentType) {
+            return new Blob([data]);
+        }
+        const textDecoder = new TextDecoder('utf-8');
+        const textData = textDecoder.decode(data);
+        if (this !== undefined) {
+            if (hasJSONContentType) {
+                this.responseType = "json"
+            } else if (hasTextContentType && this !== undefined) {
+                this.responseType = "text"
+            }
+        }
+        return textData;
+    });
+    if (axios.defaults.transformResponse instanceof Array<AxiosResponseTransformer>) {
+        transformers.push(...axios.defaults.transformResponse);
+    } else if (axios.defaults.transformResponse !== undefined) {
+        transformers.push(axios.defaults.transformResponse);
+    }
 
 	const requestConfig: AxiosRequestConfig = {
 		url,
 		headers,
-		data: body ?? formData,
+		data: realBody,
 		method: options.method,
 		withCredentials: config.WITH_CREDENTIALS,
 		cancelToken: source.token,
+        transformResponse: transformers,
+        responseType: 'arraybuffer',
 	};
 
 	onCancel(() => source.cancel('The user aborted a request.'));

src/templates/core/axios/sendRequest.hbs

@@ -7,6 +7,15 @@ import { CancelablePromise } from './CancelablePromise';
 import type { OnCancel } from './CancelablePromise';
 import type { OpenAPIConfig } from './OpenAPI';
 
+{{>functions/isBrowserEnv}}
+
+
+{{>functions/typeOfTest}}
+
+
+{{>functions/isFunction}}
+
+
 {{>functions/isDefined}}
 
 

src/templates/core/fetch/request.hbs

@@ -1,14 +1,25 @@
-const getFormData = (options: ApiRequestOptions): FormData | undefined => {
+const getFormData = (options: ApiRequestOptions) => {
 	if (options.formData) {
-		const formData = new FormData();
-
-		const process = (key: string, value: any) => {
-			if (isString(value) || isBlob(value)) {
-				formData.append(key, value);
-			} else {
-				formData.append(key, JSON.stringify(value));
-			}
-		};
+        let formData: any;        
+        if (isStandardBrowserEnv) {
+            formData = new FormData();
+        } else {
+            if (typeof FormData !== undefined) {
+                formData = new FormData();
+            } else {
+                throw new Error('Please use with nodejs version >= 18!');
+            }
+        }
+  
+        const process = (key: string, value: any) => {
+            if (isString(value)) {
+                formData.append(key, value);
+            } else if (isBlob(value)) {
+              formData.append(key, value, value.type);
+            } else {
+                formData.append(key, JSON.stringify(value));
+            }
+        };
 
 		Object.entries(options.formData)
 			.filter(([_, value]) => isDefined(value))

src/templates/core/functions/getFormData.hbs

@@ -0,0 +1,13 @@
+const isStandardBrowserEnv = (() => {
+  let product;
+  if (
+    typeof navigator !== 'undefined' &&
+    ((product = navigator.product) === 'ReactNative' ||
+      product === 'NativeScript' ||
+      product === 'NS')
+  ) {
+    return false;
+  }
+
+  return typeof window !== 'undefined' && typeof document !== 'undefined';
+})();

src/templates/core/functions/isBrowserEnv.hbs

@@ -1,3 +1,9 @@
-const isFormData = (value: any): value is FormData => {
-	return value instanceof FormData;
-};
+const isFormData = (thing: any) => {
+    const pattern = '[object FormData]';
+    return (
+        thing &&
+        ((typeof FormData === 'function' && thing instanceof FormData) ||
+        toString.call(thing) === pattern ||
+        (isFunction(thing.toString) && thing.toString() === pattern))
+    );
+};