refactor(api): Include R into ResponseOfEndpoint

Author: takker99

api/pages/project.ts

@@ -76,24 +76,22 @@ export const get = <R extends Response | undefined = Response>(
   project: string,
   options?: ListPagesOption<R>,
 ): Promise<
-  | ResponseOfEndpoint<{
+  ResponseOfEndpoint<{
     200: PageList;
     404: NotFoundError;
     401: NotLoggedInError;
     403: NotMemberError;
-  }>
-  | (undefined extends R ? undefined : never)
+  }, R>
 > =>
   setDefaults(options ?? {}).fetch(
     makeGetRequest(project, options),
   ) as Promise<
-    | ResponseOfEndpoint<{
+    ResponseOfEndpoint<{
       200: PageList;
       404: NotFoundError;
       401: NotLoggedInError;
       403: NotMemberError;
-    }>
-    | (undefined extends R ? undefined : never)
+    }, R>
   >;
 
 /**

api/pages/project/title.ts

@@ -63,22 +63,20 @@ export const get = <R extends Response | undefined = Response>(
   title: string,
   options?: GetPageOption<R>,
 ): Promise<
-  | ResponseOfEndpoint<{
+  ResponseOfEndpoint<{
     200: Page;
     404: NotFoundError;
     401: NotLoggedInError;
     403: NotMemberError;
-  }>
-  | (undefined extends R ? undefined : never)
+  }, R>
 > =>
   setDefaults(options ?? {}).fetch(
     makeGetRequest(project, title, options),
   ) as Promise<
-    | ResponseOfEndpoint<{
+    ResponseOfEndpoint<{
       200: Page;
       404: NotFoundError;
       401: NotLoggedInError;
       403: NotMemberError;
-    }>
-    | (undefined extends R ? undefined : never)
+    }, R>
   >;

targeted_response.ts

@@ -86,21 +86,24 @@ export type { StatusCode, SuccessfulStatus };
  */
 export type ResponseOfEndpoint<
   ResponseBodyMap extends Record<number, unknown> = Record<StatusCode, string>,
-> = {
-  [Status in StatusCode | keyof ResponseBodyMap]: Status extends number
-    ? ResponseBodyMap[Status] extends
-      | string
-      | Exclude<
-        JsonCompatible<ResponseBodyMap[Status]>,
-        string | number | boolean | null
-      >
-      | Uint8Array
-      | FormData
-      | Blob ? TargetedResponse<Status, ResponseBodyMap[Status]>
-    : Status extends StatusCode ? TargetedResponse<Status, string>
-    : never
-    : never;
-}[StatusCode | keyof ResponseBodyMap];
+  R extends Response | undefined = Response,
+> =
+  | {
+    [Status in StatusCode | keyof ResponseBodyMap]: Status extends number
+      ? ResponseBodyMap[Status] extends
+        | string
+        | Exclude<
+          JsonCompatible<ResponseBodyMap[Status]>,
+          string | number | boolean | null
+        >
+        | Uint8Array
+        | FormData
+        | Blob ? TargetedResponse<Status, ResponseBodyMap[Status]>
+      : Status extends StatusCode ? TargetedResponse<Status, string>
+      : never
+      : never;
+  }[StatusCode | keyof ResponseBodyMap]
+  | (undefined extends R ? undefined : never);
 
 /**
  * Type-safe {@linkcode Response} object