Merge pull request #330 from hey-api/fix/some-formatting-issues

fix: cleanup some styling issues when generating client without forma…

.changeset/two-humans-build.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+fix: cleanup some styling issues when generating client without formatting

packages/openapi-ts/src/compiler/index.ts

@@ -22,10 +22,12 @@ export class TypeScriptFile {
     }
 
     public toString(seperator: string = '\n') {
-        const importsString = this._imports.map(v => tsNodeToString(v)).join('\n');
-        return [importsString, ...this._items.map(v => (typeof v === 'string' ? v : tsNodeToString(v)))].join(
-            seperator
-        );
+        const values: string[] = [];
+        if (this._imports.length) {
+            values.push(this._imports.map(v => tsNodeToString(v)).join('\n'));
+        }
+        values.push(...this._items.map(v => (typeof v === 'string' ? v : tsNodeToString(v))))
+        return values.join(seperator);
     }
 
     public write(file: PathOrFileDescriptor, seperator: string = '\n') {

packages/openapi-ts/src/templates/core/angular/getRequestBody.hbs

@@ -1,7 +1,7 @@
 export const getRequestBody = (options: ApiRequestOptions): unknown => {
 	if (options.body) {
 		if (options.mediaType?.includes('application/json') || options.mediaType?.includes('+json')) {
-			return JSON.stringify(options.body)
+			return JSON.stringify(options.body);
 		} else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
 			return options.body;
 		} else {

packages/openapi-ts/src/templates/core/angular/request.hbs

@@ -73,7 +73,7 @@ export const request = <T>(config: OpenAPIConfig, http: HttpClient, options: Api
 		}),
 		switchMap(async response => {
 			for (const fn of config.interceptors.response._fns) {
-				response = await fn(response)
+				response = await fn(response);
 			}
 			const responseBody = getResponseBody(response);
 			const responseHeader = getResponseHeader(response, options.responseHeader);

packages/openapi-ts/src/templates/core/axios/request.hbs

@@ -76,7 +76,7 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions, ax
 				let response = await sendRequest<T>(config, options, url, body, formData, headers, onCancel, axiosClient);
 
 				for (const fn of config.interceptors.response._fns) {
-					response = await fn(response)
+					response = await fn(response);
 				}
 
 				const responseBody = getResponseBody(response);

packages/openapi-ts/src/templates/core/axios/sendRequest.hbs

@@ -22,7 +22,7 @@ export const sendRequest = async <T>(
 	onCancel(() => controller.abort());
 
 	for (const fn of config.interceptors.request._fns) {
-		requestConfig = await fn(requestConfig)
+		requestConfig = await fn(requestConfig);
 	}
 
 	try {

packages/openapi-ts/src/templates/core/fetch/getRequestBody.hbs

@@ -1,7 +1,7 @@
 export const getRequestBody = (options: ApiRequestOptions): unknown => {
 	if (options.body !== undefined) {
 		if (options.mediaType?.includes('application/json') || options.mediaType?.includes('+json')) {
-			return JSON.stringify(options.body)
+			return JSON.stringify(options.body);
 		} else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
 			return options.body;
 		} else {

packages/openapi-ts/src/templates/core/fetch/request.hbs

@@ -74,7 +74,7 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): C
 				let response = await sendRequest(config, options, url, body, formData, headers, onCancel);
 
 				for (const fn of config.interceptors.response._fns) {
-					response = await fn(response)
+					response = await fn(response);
 				}
 
 				const responseBody = await getResponseBody(response);

packages/openapi-ts/src/templates/core/fetch/sendRequest.hbs

@@ -23,7 +23,7 @@ export const sendRequest = async (
 	{{/equals}}
 
 	for (const fn of config.interceptors.request._fns) {
-		request = await fn(request)
+		request = await fn(request);
 	}
 
 	onCancel(() => controller.abort());

packages/openapi-ts/src/templates/core/xhr/getRequestBody.hbs

@@ -1,7 +1,7 @@
 export const getRequestBody = (options: ApiRequestOptions): unknown => {
 	if (options.body !== undefined) {
 		if (options.mediaType?.includes('application/json') || options.mediaType?.includes('+json')) {
-			return JSON.stringify(options.body)
+			return JSON.stringify(options.body);
 		} else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
 			return options.body;
 		} else {

packages/openapi-ts/src/templates/core/xhr/request.hbs

@@ -72,7 +72,7 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): C
 				let response = await sendRequest(config, options, url, body, formData, headers, onCancel);
 
 				for (const fn of config.interceptors.response._fns) {
-					response = await fn(response)
+					response = await fn(response);
 				}
 
 				const responseBody = getResponseBody(response);

packages/openapi-ts/src/templates/core/xhr/sendRequest.hbs

@@ -21,7 +21,7 @@ export const sendRequest = async (
 		xhr.onerror = () => reject(new Error('Network error'));
 
 		for (const fn of config.interceptors.request._fns) {
-			xhr = await fn(xhr)
+			xhr = await fn(xhr);
 		}
 
 		xhr.send(body ?? formData);

packages/openapi-ts/src/templates/exportService.hbs

@@ -5,15 +5,14 @@
 {{/equals}}
 export class {{{name}}}{{{@root.$config.postfixServices}}} {
 	{{#if @root.$config.name}}
-
 	constructor(public readonly httpRequest: BaseHttpRequest) {}
+
 	{{else}}
 	{{#equals @root.$config.client 'angular'}}
-
 	constructor(public readonly http: HttpClient) {}
+
 	{{/equals}}
 	{{/if}}
-
 	{{#each operations}}
 	/**
 	{{#if deprecated}}