refactor: require request options when needed

Author: joaotonaco

src/managers/api.ts

@@ -1,7 +1,7 @@
-import type { Route } from "@/lib/routes";
 import type { APIVersion } from "@squarecloud/api-types/v2";
 import {
 	type APIEndpoint,
+	type APIRequestArgs,
 	type APIRequestOptions,
 	type APIResponse,
 	SquareCloudAPIError,
@@ -13,9 +13,8 @@ export class APIManager {
 
 	constructor(protected readonly apiKey: string) {}
 
-	async request<T extends APIEndpoint, U extends APIRequestOptions<T>>(
-		path: Route<T>,
-		options?: U,
+	async request<T extends APIEndpoint>(
+		...[path, options]: APIRequestArgs<T>
 	): Promise<APIResponse<T>> {
 		const { url, init } = this.parseRequestOptions(path, options);
 

src/types/api.ts

@@ -1,3 +1,4 @@
+import type { Route } from "@/lib/routes";
 import type {
 	APIApplication,
 	APIApplicationBackup,
@@ -152,3 +153,15 @@ export type APIRequestOptions<T extends APIEndpoint> = {
 export type APIResponse<T extends APIEndpoint> = APIPayload<
 	APIEndpoints[T]["response"]
 >;
+
+export type QueryOrBody =
+	| { query: any }
+	| { body: any }
+	| { method: APIMethod };
+
+export type APIRequestArgs<
+	T extends APIEndpoint,
+	U extends APIRequestOptions<T> = APIRequestOptions<T>,
+> = U extends QueryOrBody
+	? [path: Route<T>, options: U]
+	: [path: Route<T>, options?: U];