- Shorter writing style for props passed in constructors

- Simplified header creation
- Made helper scripts for test more reasable

Author: ferdikoomen

CONTRIBUTING.md

@@ -8,7 +8,7 @@ Before working on a Pull Request, create an issue explaining what you want to co
 This ensures that your pull request won't go unnoticed, and that you are not contributing
 something that is not suitable for the project.
 
-If you are unfamiliar with Github Pull Requests, please read the following documentation:
+If you are unfamiliar with GitHub Pull Requests, please read the following documentation:
 https://help.github.com/articles/using-pull-requests
 
 **Your Pull Request must:**

jest.config.ts

@@ -31,6 +31,7 @@ const config: Config.InitialOptions = {
                 '<rootDir>/test/e2e/client.axios.spec.ts',
                 '<rootDir>/test/e2e/client.babel.spec.ts',
             ],
+            testPathIgnorePatterns: ['<rootDir>/test/e2e/generated'],
         },
     ],
     collectCoverageFrom: ['<rootDir>/src/**/*.ts', '!<rootDir>/src/**/*.d.ts', '!<rootDir>/bin', '!<rootDir>/dist'],

src/templates/core/BaseHttpRequest.hbs

@@ -6,11 +6,7 @@ import type { OpenAPIConfig } from './OpenAPI';
 
 export class BaseHttpRequest {
 
-	protected readonly config: OpenAPIConfig;
-
-	constructor(config: OpenAPIConfig) {
-		this.config = config;
-	}
+	constructor(protected readonly config: OpenAPIConfig) {}
 
 	public request<T>(options: ApiRequestOptions): CancelablePromise<T> {
 		throw new Error('Not Implemented');

src/templates/core/axios/request.hbs

@@ -74,7 +74,7 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): C
 			const headers = await getHeaders(config, options, formData);
 
 			if (!onCancel.isCancelled) {
-				const response = await sendRequest(config, options, url, formData, body, headers, onCancel);
+				const response = await sendRequest<T>(config, options, url, body, formData, headers, onCancel);
 				const responseBody = getResponseBody(response);
 				const responseHeader = getResponseHeader(response, options.responseHeader);
 
@@ -95,4 +95,3 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): C
 		}
 	});
 };
-

src/templates/core/axios/sendRequest.hbs

@@ -1,12 +1,12 @@
-const sendRequest = async (
+const sendRequest = async <T>(
 	config: OpenAPIConfig,
 	options: ApiRequestOptions,
 	url: string,
-	formData: FormData | undefined,
 	body: any,
+	formData: FormData | undefined,
 	headers: Record<string, string>,
 	onCancel: OnCancel
-): Promise<AxiosResponse<any>> => {
+): Promise<AxiosResponse<T>> => {
 	const source = axios.CancelToken.source();
 
 	const requestConfig: AxiosRequestConfig = {

src/templates/core/fetch/getHeaders.hbs

@@ -4,7 +4,7 @@ const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Pr
 	const password = await resolve(options, config.PASSWORD);
 	const additionalHeaders = await resolve(options, config.HEADERS);
 
-	const defaultHeaders = Object.entries({
+	const headers = Object.entries({
 		Accept: 'application/json',
 		...additionalHeaders,
 		...options.headers,
@@ -15,28 +15,26 @@ const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Pr
 			[key]: String(value),
 		}), {} as Record<string, string>);
 
-	const headers = new Headers(defaultHeaders);
-
 	if (isStringWithValue(token)) {
-		headers.append('Authorization', `Bearer ${token}`);
+		headers['Authorization'] = `Bearer ${token}`;
 	}
 
 	if (isStringWithValue(username) && isStringWithValue(password)) {
 		const credentials = base64(`${username}:${password}`);
-		headers.append('Authorization', `Basic ${credentials}`);
+		headers['Authorization'] = `Basic ${credentials}`;
 	}
 
 	if (options.body) {
 		if (options.mediaType) {
-			headers.append('Content-Type', options.mediaType);
+			headers['Content-Type'] = options.mediaType;
 		} else if (isBlob(options.body)) {
-			headers.append('Content-Type', options.body.type || 'application/octet-stream');
+			headers['Content-Type'] = options.body.type || 'application/octet-stream';
 		} else if (isString(options.body)) {
-			headers.append('Content-Type', 'text/plain');
+			headers['Content-Type'] = 'text/plain';
 		} else if (!isFormData(options.body)) {
-			headers.append('Content-Type', 'application/json');
+			headers['Content-Type'] = 'application/json';
 		}
 	}
 
-	return headers;
+	return new Headers(headers);
 };

src/templates/core/fetch/getRequestBody.hbs

@@ -1,4 +1,4 @@
-const getRequestBody = (options: ApiRequestOptions): BodyInit | undefined => {
+const getRequestBody = (options: ApiRequestOptions): any => {
 	if (options.body) {
 		if (options.mediaType?.includes('/json')) {
 			return JSON.stringify(options.body)

src/templates/core/fetch/request.hbs

@@ -71,7 +71,7 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): C
 			const headers = await getHeaders(config, options);
 
 			if (!onCancel.isCancelled) {
-				const response = await sendRequest(config, options, url, formData, body, headers, onCancel);
+				const response = await sendRequest(config, options, url, body, formData, headers, onCancel);
 				const responseBody = await getResponseBody(response);
 				const responseHeader = getResponseHeader(response, options.responseHeader);
 

src/templates/core/fetch/sendRequest.hbs

@@ -2,8 +2,8 @@ export const sendRequest = async (
 	config: OpenAPIConfig,
 	options: ApiRequestOptions,
 	url: string,
+	body: any,
 	formData: FormData | undefined,
-	body: BodyInit | undefined,
 	headers: Headers,
 	onCancel: OnCancel
 ): Promise<Response> => {

src/templates/core/functions/getUrl.hbs

@@ -1,18 +1,18 @@
 const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => {
-    const encoder = config.ENCODE_PATH || encodeURI;
+	const encoder = config.ENCODE_PATH || encodeURI;
 
-    const path = options.url
-        .replace('{api-version}', config.VERSION)
-        .replace(/{(.*?)}/g, (substring: string, group: string) => {
-            if (options.path?.hasOwnProperty(group)) {
-                return encoder(String(options.path[group]));
-            }
-            return substring;
-        });
+	const path = options.url
+		.replace('{api-version}', config.VERSION)
+		.replace(/{(.*?)}/g, (substring: string, group: string) => {
+			if (options.path?.hasOwnProperty(group)) {
+				return encoder(String(options.path[group]));
+			}
+			return substring;
+		});
 
-    const url = `${config.BASE}${path}`;
-    if (options.query) {
-        return `${url}${getQueryString(options.query)}`;
-    }
-    return url;
+	const url = `${config.BASE}${path}`;
+	if (options.query) {
+		return `${url}${getQueryString(options.query)}`;
+	}
+	return url;
 };