refactor: api manager request function

Author: joaotonaco

src/managers/api.ts

@@ -17,25 +17,7 @@ export class APIManager {
 		path: Route<T>,
 		options?: APIRequestOptions<T>,
 	): Promise<APIResponse<T>> {
-		const init = options || ({} as RequestInit);
-
-		init.method = init.method || "GET";
-		init.headers = {
-			...(init.headers || {}),
-			Authorization: this.apiKey,
-		};
-
-		const url = new URL(path, `${this.baseUrl}/${this.version}`);
-
-		if ("query" in init && init.query) {
-			const query = new URLSearchParams(init.query as Record<string, string>);
-			url.search = query.toString();
-			init.query = undefined;
-		}
-
-		if ("body" in init && init.body && !(init.body instanceof Buffer)) {
-			init.body = JSON.stringify(init.body);
-		}
+		const { url, init } = this.parseRequestOptions(path, options);
 
 		const response = await fetch(url, init).catch((err) => {
 			throw new SquareCloudAPIError(err.code, err.message);
@@ -49,29 +31,30 @@ export class APIManager {
 		return data;
 	}
 
-	async fetch<T>(
+	private parseRequestOptions(
 		path: string,
-		options: RequestInit = {},
-	): Promise<APIPayload<T>> {
-		options.method = options.method || "GET";
-		options.headers = {
-			...(options.headers || {}),
+		options?: APIRequestOptions<APIEndpoint>,
+	) {
+		const init = options || ({} as RequestInit);
+
+		init.method = init.method || "GET";
+		init.headers = {
+			...(init.headers || {}),
 			Authorization: this.apiKey,
 		};
 
-		const res = await fetch(
-			`${this.baseUrl}/${this.version}/${path}`,
-			options,
-		).catch((err) => {
-			throw new SquareCloudAPIError(err.code, err.message);
-		});
+		const url = new URL(path, `${this.baseUrl}/${this.version}`);
 
-		const data = await res.json();
+		if ("query" in init && init.query) {
+			const query = new URLSearchParams(init.query as Record<string, string>);
+			url.search = query.toString();
+			init.query = undefined;
+		}
 
-		if (!data || data.status === "error" || !res.ok) {
-			throw new SquareCloudAPIError(data?.code || "COMMON_ERROR");
+		if ("body" in init && init.body && !(init.body instanceof Buffer)) {
+			init.body = JSON.stringify(init.body);
 		}
 
-		return data;
+		return { url, init };
 	}
 }