Merge pull request ferdikoomen#1442 from edwinveldhuizen/feature/extendable-custom-request

ferdikoomen · web-flow · commit 30bc235ac763 · 2023-04-11T08:37:09.000+02:00
[request] export used functions for reusability
diff --git a/src/templates/core/angular/getHeaders.hbs b/src/templates/core/angular/getHeaders.hbs
@@ -1,4 +1,4 @@
-const getHeaders = (config: OpenAPIConfig, options: ApiRequestOptions): Observable<HttpHeaders> => {
+export const getHeaders = (config: OpenAPIConfig, options: ApiRequestOptions): Observable<HttpHeaders> => {
 	return forkJoin({
 		token: resolve(options, config.TOKEN),
 		username: resolve(options, config.USERNAME),
diff --git a/src/templates/core/angular/getRequestBody.hbs b/src/templates/core/angular/getRequestBody.hbs
@@ -1,4 +1,4 @@
-const getRequestBody = (options: ApiRequestOptions): any => {
+export const getRequestBody = (options: ApiRequestOptions): any => {
 	if (options.body) {
 		if (options.mediaType?.includes('/json')) {
 			return JSON.stringify(options.body)
diff --git a/src/templates/core/angular/getResponseBody.hbs b/src/templates/core/angular/getResponseBody.hbs
@@ -1,4 +1,4 @@
-const getResponseBody = <T>(response: HttpResponse<T>): T | undefined => {
+export const getResponseBody = <T>(response: HttpResponse<T>): T | undefined => {
 	if (response.status !== 204 && response.body !== null) {
 		return response.body;
 	}
diff --git a/src/templates/core/angular/getResponseHeader.hbs b/src/templates/core/angular/getResponseHeader.hbs
@@ -1,4 +1,4 @@
-const getResponseHeader = <T>(response: HttpResponse<T>, responseHeader?: string): string | undefined => {
+export const getResponseHeader = <T>(response: HttpResponse<T>, responseHeader?: string): string | undefined => {
 	if (responseHeader) {
 		const value = response.headers.get(responseHeader);
 		if (isString(value)) {
diff --git a/src/templates/core/axios/getHeaders.hbs b/src/templates/core/axios/getHeaders.hbs
@@ -1,4 +1,4 @@
-const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions, formData?: FormData): Promise<Record<string, string>> => {
+export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions, formData?: FormData): 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);
diff --git a/src/templates/core/axios/getRequestBody.hbs b/src/templates/core/axios/getRequestBody.hbs
@@ -1,4 +1,4 @@
-const getRequestBody = (options: ApiRequestOptions): any => {
+export const getRequestBody = (options: ApiRequestOptions): any => {
 	if (options.body) {
 		return options.body;
 	}
diff --git a/src/templates/core/axios/getResponseBody.hbs b/src/templates/core/axios/getResponseBody.hbs
@@ -1,4 +1,4 @@
-const getResponseBody = (response: AxiosResponse<any>): any => {
+export const getResponseBody = (response: AxiosResponse<any>): any => {
 	if (response.status !== 204) {
 		return response.data;
 	}
diff --git a/src/templates/core/axios/getResponseHeader.hbs b/src/templates/core/axios/getResponseHeader.hbs
@@ -1,4 +1,4 @@
-const getResponseHeader = (response: AxiosResponse<any>, responseHeader?: string): string | undefined => {
+export const getResponseHeader = (response: AxiosResponse<any>, responseHeader?: string): string | undefined => {
 	if (responseHeader) {
 		const content = response.headers[responseHeader];
 		if (isString(content)) {
diff --git a/src/templates/core/axios/sendRequest.hbs b/src/templates/core/axios/sendRequest.hbs
@@ -1,4 +1,4 @@
-const sendRequest = async <T>(
+export const sendRequest = async <T>(
 	config: OpenAPIConfig,
 	options: ApiRequestOptions,
 	url: string,
diff --git a/src/templates/core/fetch/getHeaders.hbs b/src/templates/core/fetch/getHeaders.hbs
@@ -1,4 +1,4 @@
-const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
+export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
 	const token = await resolve(options, config.TOKEN);
 	const username = await resolve(options, config.USERNAME);
 	const password = await resolve(options, config.PASSWORD);
diff --git a/src/templates/core/fetch/getRequestBody.hbs b/src/templates/core/fetch/getRequestBody.hbs
@@ -1,4 +1,4 @@
-const getRequestBody = (options: ApiRequestOptions): any => {
+export const getRequestBody = (options: ApiRequestOptions): any => {
 	if (options.body !== undefined) {
 		if (options.mediaType?.includes('/json')) {
 			return JSON.stringify(options.body)
diff --git a/src/templates/core/fetch/getResponseBody.hbs b/src/templates/core/fetch/getResponseBody.hbs
@@ -1,4 +1,4 @@
-const getResponseBody = async (response: Response): Promise<any> => {
+export const getResponseBody = async (response: Response): Promise<any> => {
 	if (response.status !== 204) {
 		try {
 			const contentType = response.headers.get('Content-Type');
diff --git a/src/templates/core/fetch/getResponseHeader.hbs b/src/templates/core/fetch/getResponseHeader.hbs
@@ -1,4 +1,4 @@
-const getResponseHeader = (response: Response, responseHeader?: string): string | undefined => {
+export const getResponseHeader = (response: Response, responseHeader?: string): string | undefined => {
 	if (responseHeader) {
 		const content = response.headers.get(responseHeader);
 		if (isString(content)) {
diff --git a/src/templates/core/functions/base64.hbs b/src/templates/core/functions/base64.hbs
@@ -1,4 +1,4 @@
-const base64 = (str: string): string => {
+export const base64 = (str: string): string => {
 	try {
 		return btoa(str);
 	} catch (err) {
diff --git a/src/templates/core/functions/catchErrorCodes.hbs b/src/templates/core/functions/catchErrorCodes.hbs
@@ -1,4 +1,4 @@
-const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): void => {
+export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): void => {
 	const errors: Record<number, string> = {
 		400: 'Bad Request',
 		401: 'Unauthorized',
diff --git a/src/templates/core/functions/getFormData.hbs b/src/templates/core/functions/getFormData.hbs
@@ -1,4 +1,4 @@
-const getFormData = (options: ApiRequestOptions): FormData | undefined => {
+export const getFormData = (options: ApiRequestOptions): FormData | undefined => {
 	if (options.formData) {
 		const formData = new FormData();
 
diff --git a/src/templates/core/functions/getQueryString.hbs b/src/templates/core/functions/getQueryString.hbs
@@ -1,4 +1,4 @@
-const getQueryString = (params: Record<string, any>): string => {
+export const getQueryString = (params: Record<string, any>): string => {
 	const qs: string[] = [];
 
 	const append = (key: string, value: any) => {
diff --git a/src/templates/core/functions/isBlob.hbs b/src/templates/core/functions/isBlob.hbs
@@ -1,4 +1,4 @@
-const isBlob = (value: any): value is Blob => {
+export const isBlob = (value: any): value is Blob => {
 	return (
 		typeof value === 'object' &&
 		typeof value.type === 'string' &&
diff --git a/src/templates/core/functions/isDefined.hbs b/src/templates/core/functions/isDefined.hbs
@@ -1,3 +1,3 @@
-const isDefined = <T>(value: T | null | undefined): value is Exclude<T, null | undefined> => {
+export const isDefined = <T>(value: T | null | undefined): value is Exclude<T, null | undefined> => {
 	return value !== undefined && value !== null;
 };
diff --git a/src/templates/core/functions/isFormData.hbs b/src/templates/core/functions/isFormData.hbs
@@ -1,3 +1,3 @@
-const isFormData = (value: any): value is FormData => {
+export const isFormData = (value: any): value is FormData => {
 	return value instanceof FormData;
 };
diff --git a/src/templates/core/functions/isString.hbs b/src/templates/core/functions/isString.hbs
@@ -1,3 +1,3 @@
-const isString = (value: any): value is string => {
+export const isString = (value: any): value is string => {
 	return typeof value === 'string';
 };
diff --git a/src/templates/core/functions/isStringWithValue.hbs b/src/templates/core/functions/isStringWithValue.hbs
@@ -1,3 +1,3 @@
-const isStringWithValue = (value: any): value is string => {
+export const isStringWithValue = (value: any): value is string => {
 	return isString(value) && value !== '';
 };
diff --git a/src/templates/core/functions/isSuccess.hbs b/src/templates/core/functions/isSuccess.hbs
@@ -1,3 +1,3 @@
-const isSuccess = (status: number): boolean => {
+export const isSuccess = (status: number): boolean => {
 	return status >= 200 && status < 300;
 };
diff --git a/src/templates/core/functions/resolve.hbs b/src/templates/core/functions/resolve.hbs
@@ -1,6 +1,6 @@
 type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
 
-const resolve = async <T>(options: ApiRequestOptions, resolver?: T | Resolver<T>): Promise<T | undefined> => {
+export const resolve = async <T>(options: ApiRequestOptions, resolver?: T | Resolver<T>): Promise<T | undefined> => {
 	if (typeof resolver === 'function') {
 		return (resolver as Resolver<T>)(options);
 	}
diff --git a/src/templates/core/node/getHeaders.hbs b/src/templates/core/node/getHeaders.hbs
@@ -1,4 +1,4 @@
-const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
+export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
 	const token = await resolve(options, config.TOKEN);
 	const username = await resolve(options, config.USERNAME);
 	const password = await resolve(options, config.PASSWORD);
diff --git a/src/templates/core/node/getRequestBody.hbs b/src/templates/core/node/getRequestBody.hbs
@@ -1,4 +1,4 @@
-const getRequestBody = (options: ApiRequestOptions): any => {
+export const getRequestBody = (options: ApiRequestOptions): any => {
 	if (options.body !== undefined) {
 		if (options.mediaType?.includes('/json')) {
 			return JSON.stringify(options.body)
diff --git a/src/templates/core/node/getResponseBody.hbs b/src/templates/core/node/getResponseBody.hbs
@@ -1,4 +1,4 @@
-const getResponseBody = async (response: Response): Promise<any> => {
+export const getResponseBody = async (response: Response): Promise<any> => {
 	if (response.status !== 204) {
 		try {
 			const contentType = response.headers.get('Content-Type');
diff --git a/src/templates/core/node/getResponseHeader.hbs b/src/templates/core/node/getResponseHeader.hbs
@@ -1,4 +1,4 @@
-const getResponseHeader = (response: Response, responseHeader?: string): string | undefined => {
+export const getResponseHeader = (response: Response, responseHeader?: string): string | undefined => {
 	if (responseHeader) {
 		const content = response.headers.get(responseHeader);
 		if (isString(content)) {
diff --git a/src/templates/core/xhr/getHeaders.hbs b/src/templates/core/xhr/getHeaders.hbs
@@ -1,4 +1,4 @@
-const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
+export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
 	const token = await resolve(options, config.TOKEN);
 	const username = await resolve(options, config.USERNAME);
 	const password = await resolve(options, config.PASSWORD);
diff --git a/src/templates/core/xhr/getRequestBody.hbs b/src/templates/core/xhr/getRequestBody.hbs
@@ -1,4 +1,4 @@
-const getRequestBody = (options: ApiRequestOptions): any => {
+export const getRequestBody = (options: ApiRequestOptions): any => {
 	if (options.body !== undefined) {
 		if (options.mediaType?.includes('/json')) {
 			return JSON.stringify(options.body)
diff --git a/src/templates/core/xhr/getResponseBody.hbs b/src/templates/core/xhr/getResponseBody.hbs
@@ -1,4 +1,4 @@
-const getResponseBody = (xhr: XMLHttpRequest): any => {
+export const getResponseBody = (xhr: XMLHttpRequest): any => {
 	if (xhr.status !== 204) {
 		try {
 			const contentType = xhr.getResponseHeader('Content-Type');
diff --git a/src/templates/core/xhr/getResponseHeader.hbs b/src/templates/core/xhr/getResponseHeader.hbs
@@ -1,4 +1,4 @@
-const getResponseHeader = (xhr: XMLHttpRequest, responseHeader?: string): string | undefined => {
+export const getResponseHeader = (xhr: XMLHttpRequest, responseHeader?: string): string | undefined => {
 	if (responseHeader) {
 		const content = xhr.getResponseHeader(responseHeader);
 		if (isString(content)) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const getHeaders = (config: OpenAPIConfig, options: ApiRequestOptions): Observable<HttpHeaders> => {`
	`1`	`+export const getHeaders = (config: OpenAPIConfig, options: ApiRequestOptions): Observable<HttpHeaders> => {`
`2`	`2`	`return forkJoin({`
`3`	`3`	`token: resolve(options, config.TOKEN),`
`4`	`4`	`username: resolve(options, config.USERNAME),`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const getRequestBody = (options: ApiRequestOptions): any => {`
	`1`	`+export const getRequestBody = (options: ApiRequestOptions): any => {`
`2`	`2`	`if (options.body) {`
`3`	`3`	`if (options.mediaType?.includes('/json')) {`
`4`	`4`	`return JSON.stringify(options.body)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const getResponseBody = <T>(response: HttpResponse<T>): T \| undefined => {`
	`1`	`+export const getResponseBody = <T>(response: HttpResponse<T>): T \| undefined => {`
`2`	`2`	`if (response.status !== 204 && response.body !== null) {`
`3`	`3`	`return response.body;`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const getResponseHeader = <T>(response: HttpResponse<T>, responseHeader?: string): string \| undefined => {`
	`1`	`+export const getResponseHeader = <T>(response: HttpResponse<T>, responseHeader?: string): string \| undefined => {`
`2`	`2`	`if (responseHeader) {`
`3`	`3`	`const value = response.headers.get(responseHeader);`
`4`	`4`	`if (isString(value)) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions, formData?: FormData): Promise<Record<string, string>> => {`
	`1`	`+export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions, formData?: FormData): Promise<Record<string, string>> => {`
`2`	`2`	`const token = await resolve(options, config.TOKEN);`
`3`	`3`	`const username = await resolve(options, config.USERNAME);`
`4`	`4`	`const password = await resolve(options, config.PASSWORD);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const getResponseBody = (response: AxiosResponse<any>): any => {`
	`1`	`+export const getResponseBody = (response: AxiosResponse<any>): any => {`
`2`	`2`	`if (response.status !== 204) {`
`3`	`3`	`return response.data;`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const getResponseHeader = (response: AxiosResponse<any>, responseHeader?: string): string \| undefined => {`
	`1`	`+export const getResponseHeader = (response: AxiosResponse<any>, responseHeader?: string): string \| undefined => {`
`2`	`2`	`if (responseHeader) {`
`3`	`3`	`const content = response.headers[responseHeader];`
`4`	`4`	`if (isString(content)) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const sendRequest = async <T>(`
	`1`	`+export const sendRequest = async <T>(`
`2`	`2`	`config: OpenAPIConfig,`
`3`	`3`	`options: ApiRequestOptions,`
`4`	`4`	`url: string,`