chore: much better solution

Author: imp-dance

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryfylke-react/rtk-query-loader",
-  "version": "0.2.85",
+  "version": "0.2.9",
   "description": "Lets you create loaders that contain multiple RTK queries.",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",

src/createLoader.ts

@@ -81,17 +81,20 @@ export const createLoader = <
   return loader;
 };
 
-/* const l = createLoader({
+/* const getData = <T>(): T | undefined => "" as T;
+
+const l = createLoader({
   queries: () =>
     [
       {
+        data: getData<{ key: string }>(),
         isError: false,
         isFetching: false,
         isLoading: false,
         isSuccess: false,
         isUninitialized: true,
         refetch: () => {},
-      } as Types.UseQueryResult<{key: "value"}>,
+      },
     ] as const,
   transform: (queries) => ({
     test: queries[0].data.key,

src/types.ts

@@ -23,8 +23,10 @@ export type UseQueryResult<T> = {
   refetch: () => void; // A function to force refetch the query
 };
 
-export type MakeDataRequired<T> = {
-  [K in keyof T]-?: NonNullable<Required<T[K]>>;
+export type MakeDataRequired<
+  T extends readonly UseQueryResult<unknown>[]
+> = {
+  [K in keyof T]-?: T[K] & { data: NonNullable<T[K]["data"]> };
 };
 
 export type LoaderTransformFunction<