request: fix/improve typesafety of TData (ohcnetwork#6324)

src/Utils/request/request.ts

@@ -2,7 +2,7 @@ import handleResponse from "./handleResponse";
 import { RequestOptions, RequestResult, Route } from "./types";
 import { makeHeaders, makeUrl } from "./utils";
 
-interface Options extends RequestOptions {
+interface Options<TData> extends RequestOptions<TData> {
   controller?: AbortController;
 }
 
@@ -16,7 +16,7 @@ export default async function request<TData>(
     onResponse,
     silent,
     reattempts = 3,
-  }: Options = {}
+  }: Options<TData> = {}
 ): Promise<RequestResult<TData>> {
   const signal = controller?.signal;
   const url = makeUrl(path, query, pathParams);

src/Utils/request/useQuery.ts

@@ -3,22 +3,22 @@ import { QueryRoute, RequestOptions, RequestResult } from "./types";
 import request from "./request";
 import { mergeRequestOptions } from "./utils";
 
-export interface QueryOptions extends RequestOptions {
+export interface QueryOptions<TData> extends RequestOptions<TData> {
   prefetch?: boolean;
   refetchOnWindowFocus?: boolean;
 }
 
 export default function useQuery<TData>(
   route: QueryRoute<TData>,
-  options?: QueryOptions
+  options?: QueryOptions<TData>
 ) {
   const [response, setResponse] = useState<RequestResult<TData>>();
   const [loading, setLoading] = useState(false);
 
   const controllerRef = useRef<AbortController>();
 
   const runQuery = useCallback(
-    async (overrides?: QueryOptions) => {
+    async (overrides?: QueryOptions<TData>) => {
       controllerRef.current?.abort();
 
       const controller = new AbortController();

src/Utils/request/utils.ts

@@ -69,10 +69,10 @@ export function getAuthorizationHeader() {
   return null;
 }
 
-export function mergeRequestOptions(
-  options: RequestOptions,
-  overrides: RequestOptions
-): RequestOptions {
+export function mergeRequestOptions<TData>(
+  options: RequestOptions<TData>,
+  overrides: RequestOptions<TData>
+): RequestOptions<TData> {
   return {
     ...options,
     ...overrides,