@refinedev/core 4.7.2 → 4.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@refinedev/core",
-  "version": "4.7.2",
+  "version": "4.8.0",
   "description": "refine is a React-based framework for building internal tools, rapidly. It ships with Ant Design System, an enterprise-level UI toolkit.",
   "private": false,
   "main": "dist/index.js",

package/src/hooks/auditLog/useLogList/index.ts

@@ -7,34 +7,44 @@ import {
 
 import { AuditLogContext } from "@contexts/auditLog";
 import { queryKeys } from "@definitions/helpers";
-import { HttpError, MetaDataQuery } from "../../../interfaces";
+import { HttpError, MetaQuery } from "../../../interfaces";
 
-export type UseLogProps<TData, TError> = {
+export type UseLogProps<TQueryFnData, TError, TData> = {
     resource: string;
     action?: string;
     meta?: Record<number | string, any>;
     author?: Record<number | string, any>;
-    queryOptions?: UseQueryOptions<TData, TError>;
-    metaData?: MetaDataQuery;
+    queryOptions?: UseQueryOptions<TQueryFnData, TError, TData>;
+    metaData?: MetaQuery;
 };
 
 /**
  * useLogList is used to get and filter audit logs.
+ *
  * @see {@link https://refine.dev/docs/core/hooks/audit-log/useLogList} for more details.
+ *
+ * @typeParam TQueryFnData - Result data returned by the query function.
+ * @typeParam TError - Custom error object that extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#httperror `HttpError`}
+ * @typeParam TData - Result data returned by the `select` function. Defaults to `TQueryFnData`
+ *
  */
-export const useLogList = <TData = any, TError extends HttpError = HttpError>({
+export const useLogList = <
+    TQueryFnData = any,
+    TError extends HttpError = HttpError,
+    TData = TQueryFnData,
+>({
     resource,
     action,
     meta,
     author,
     metaData,
     queryOptions,
-}: UseLogProps<TData, TError>): UseQueryResult<TData> => {
+}: UseLogProps<TQueryFnData, TError, TData>): UseQueryResult<TData> => {
     const { get } = useContext(AuditLogContext);
 
     const queryKey = queryKeys(resource, undefined, metaData);
 
-    const queryResponse = useQuery<TData, TError>(
+    const queryResponse = useQuery<TQueryFnData, TError, TData>(
         queryKey.logList(meta),
         () =>
             get?.({

package/src/hooks/data/useCustom.ts

@@ -34,7 +34,7 @@ interface UseCustomConfig<TQuery, TPayload> {
     headers?: {};
 }
 
-export type UseCustomProps<TData, TError, TQuery, TPayload> = {
+export type UseCustomProps<TQueryFnData, TError, TQuery, TPayload, TData> = {
     /**
      * request's URL
      */
@@ -50,7 +50,11 @@ export type UseCustomProps<TData, TError, TQuery, TPayload> = {
     /**
      * react-query's [useQuery](https://tanstack.com/query/v4/docs/reference/useQuery) options"
      */
-    queryOptions?: UseQueryOptions<CustomResponse<TData>, TError>;
+    queryOptions?: UseQueryOptions<
+        CustomResponse<TQueryFnData>,
+        TError,
+        CustomResponse<TData>
+    >;
     /**
      * meta data for `dataProvider`
      */
@@ -77,17 +81,20 @@ export type UseCustomProps<TData, TError, TQuery, TPayload> = {
  *
  * @see {@link https://refine.dev/docs/core/hooks/data/useCustom} for more details.
  *
- * @typeParam TData - Result data of the query extends {@link https://refine.dev/docs/core/interfaceReferences#baserecord `BaseRecord`}
- * @typeParam TError - Custom error object that extends {@link https://refine.dev/docs/core/interfaceReferences#httperror `HttpError`}
+ * @typeParam TQueryFnData - Result data returned by the query function. Extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#baserecord `BaseRecord`}
+ * @typeParam TError - Custom error object that extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#httperror `HttpError`}
  * @typeParam TQuery - Values for query params
  * @typeParam TPayload - Values for params
+ * @typeParam TData - Result data returned by the `select` function. Extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#baserecord `BaseRecord`}. Defaults to `TQueryFnData`
  *
  */
+
 export const useCustom = <
-    TData extends BaseRecord = BaseRecord,
+    TQueryFnData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
     TQuery = unknown,
     TPayload = unknown,
+    TData extends BaseRecord = TQueryFnData,
 >({
     url,
     method,
@@ -98,10 +105,13 @@ export const useCustom = <
     meta,
     metaData,
     dataProviderName,
-}: UseCustomProps<TData, TError, TQuery, TPayload>): QueryObserverResult<
-    CustomResponse<TData>,
-    TError
-> => {
+}: UseCustomProps<
+    TQueryFnData,
+    TError,
+    TQuery,
+    TPayload,
+    TData
+>): QueryObserverResult<CustomResponse<TData>, TError> => {
     const dataProvider = useDataProvider();
 
     const { custom } = dataProvider(dataProviderName);
@@ -113,7 +123,11 @@ export const useCustom = <
     const handleNotification = useHandleNotification();
 
     if (custom) {
-        const queryResponse = useQuery<CustomResponse<TData>, TError>({
+        const queryResponse = useQuery<
+            CustomResponse<TQueryFnData>,
+            TError,
+            CustomResponse<TData>
+        >({
             queryKey: [
                 dataProviderName,
                 "custom",
@@ -122,7 +136,7 @@ export const useCustom = <
                 { ...config, ...(pickNotDeprecated(meta, metaData) || {}) },
             ],
             queryFn: ({ queryKey, pageParam, signal }) =>
-                custom<TData>({
+                custom<TQueryFnData>({
                     url,
                     method,
                     ...config,

package/src/hooks/data/useInfiniteList.ts

@@ -80,7 +80,7 @@ type BaseInfiniteListProps = {
     dataProviderName?: string;
 };
 
-export type UseInfiniteListProps<TData, TError> = {
+export type UseInfiniteListProps<TQueryFnData, TError, TData> = {
     /**
      * Resource name for API data interactions
      */
@@ -88,7 +88,11 @@ export type UseInfiniteListProps<TData, TError> = {
     /**
      * Tanstack Query's [useInfiniteQuery](https://tanstack.com/query/v4/docs/react/reference/useInfiniteQuery) options
      */
-    queryOptions?: UseInfiniteQueryOptions<GetListResponse<TData>, TError>;
+    queryOptions?: UseInfiniteQueryOptions<
+        GetListResponse<TQueryFnData>,
+        TError,
+        GetListResponse<TData>
+    >;
 } & BaseInfiniteListProps &
     SuccessErrorNotification<
         InfiniteData<GetListResponse<TData>>,
@@ -104,13 +108,16 @@ export type UseInfiniteListProps<TData, TError> = {
  *
  * @see {@link https://refine.dev/docs/core/hooks/data/useInfiniteList} for more details.
  *
- * @typeParam TData - Result data of the query extends {@link https://refine.dev/docs/core/interfaceReferences#baserecord `BaseRecord`}
- * @typeParam TError - Custom error object that extends {@link https://refine.dev/docs/core/interfaceReferences#httperror `HttpError`}
+ * @typeParam TQueryFnData - Result data returned by the query function. Extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#baserecord `BaseRecord`}
+ * @typeParam TError - Custom error object that extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#httperror `HttpError`}
+ * @typeParam TData - Result data returned by the `select` function. Extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#baserecord `BaseRecord`}. Defaults to `TQueryFnData`
  *
  */
+
 export const useInfiniteList = <
-    TData extends BaseRecord = BaseRecord,
+    TQueryFnData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
+    TData extends BaseRecord = TQueryFnData,
 >({
     resource,
     config,
@@ -127,10 +134,11 @@ export const useInfiniteList = <
     onLiveEvent,
     liveParams,
     dataProviderName,
-}: UseInfiniteListProps<TData, TError>): InfiniteQueryObserverResult<
-    GetListResponse<TData>,
-    TError
-> => {
+}: UseInfiniteListProps<
+    TQueryFnData,
+    TError,
+    TData
+>): InfiniteQueryObserverResult<GetListResponse<TData>, TError> => {
     const { resources } = useResource();
     const dataProvider = useDataProvider();
     const translate = useTranslate();
@@ -203,7 +211,11 @@ export const useInfiniteList = <
         onLiveEvent,
     });
 
-    const queryResponse = useInfiniteQuery<GetListResponse<TData>, TError>(
+    const queryResponse = useInfiniteQuery<
+        GetListResponse<TQueryFnData>,
+        TError,
+        GetListResponse<TData>
+    >(
         queryKey.list({
             filters: prefferedFilters,
             hasPagination: isServerPagination,
@@ -223,7 +235,7 @@ export const useInfiniteList = <
                 current: pageParam,
             };
 
-            return getList<TData>({
+            return getList<TQueryFnData>({
                 resource,
                 pagination: paginationProperties,
                 hasPagination: isServerPagination,

package/src/hooks/data/useList.ts

@@ -77,7 +77,7 @@ export type BaseListProps = {
     dataProviderName?: string;
 };
 
-export type UseListProps<TData, TError> = {
+export type UseListProps<TQueryFnData, TError, TData> = {
     /**
      * Resource name for API data interactions
      */
@@ -86,7 +86,11 @@ export type UseListProps<TData, TError> = {
     /**
      * Tanstack Query's [useQuery](https://tanstack.com/query/v4/docs/reference/useQuery) options
      */
-    queryOptions?: UseQueryOptions<GetListResponse<TData>, TError>;
+    queryOptions?: UseQueryOptions<
+        GetListResponse<TQueryFnData>,
+        TError,
+        GetListResponse<TData>
+    >;
 } & BaseListProps &
     SuccessErrorNotification<
         GetListResponse<TData>,
@@ -102,13 +106,16 @@ export type UseListProps<TData, TError> = {
  *
  * @see {@link https://refine.dev/docs/core/hooks/data/useList} for more details.
  *
- * @typeParam TData - Result data of the query extends {@link https://refine.dev/docs/core/interfaceReferences#baserecord `BaseRecord`}
- * @typeParam TError - Custom error object that extends {@link https://refine.dev/docs/core/interfaceReferences#httperror `HttpError`}
+ * @typeParam TQueryFnData - Result data returned by the query function. Extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#baserecord `BaseRecord`}
+ * @typeParam TError - Custom error object that extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#httperror `HttpError`}
+ * @typeParam TData - Result data returned by the `select` function. Extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#baserecord `BaseRecord`}. Defaults to `TQueryFnData`
  *
  */
+
 export const useList = <
-    TData extends BaseRecord = BaseRecord,
+    TQueryFnData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
+    TData extends BaseRecord = TQueryFnData,
 >({
     resource,
     config,
@@ -125,7 +132,7 @@ export const useList = <
     onLiveEvent,
     liveParams,
     dataProviderName,
-}: UseListProps<TData, TError>): QueryObserverResult<
+}: UseListProps<TQueryFnData, TError, TData>): QueryObserverResult<
     GetListResponse<TData>,
     TError
 > => {
@@ -201,7 +208,11 @@ export const useList = <
         onLiveEvent,
     });
 
-    const queryResponse = useQuery<GetListResponse<TData>, TError>(
+    const queryResponse = useQuery<
+        GetListResponse<TQueryFnData>,
+        TError,
+        GetListResponse<TData>
+    >(
         queryKey.list({
             filters: prefferedFilters,
             hasPagination: isServerPagination,
@@ -216,7 +227,7 @@ export const useList = <
             }),
         }),
         ({ queryKey, pageParam, signal }) => {
-            return getList<TData>({
+            return getList<TQueryFnData>({
                 resource: resource!,
                 pagination: prefferedPagination,
                 hasPagination: isServerPagination,
@@ -267,7 +278,7 @@ export const useList = <
                     return queryOptions?.select?.(data);
                 }
 
-                return data;
+                return data as unknown as GetListResponse<TData>;
             },
             onSuccess: (data) => {
                 queryOptions?.onSuccess?.(data);

package/src/hooks/data/useMany.ts

@@ -29,7 +29,7 @@ import {
     useActiveAuthProvider,
 } from "@definitions/helpers";
 
-export type UseManyProps<TData, TError> = {
+export type UseManyProps<TQueryFnData, TError, TData> = {
     /**
      * Resource name for API data interactions
      */
@@ -42,7 +42,11 @@ export type UseManyProps<TData, TError> = {
     /**
      * react-query's [useQuery](https://tanstack.com/query/v4/docs/reference/useQuery) options
      */
-    queryOptions?: UseQueryOptions<GetManyResponse<TData>, TError>;
+    queryOptions?: UseQueryOptions<
+        GetManyResponse<TQueryFnData>,
+        TError,
+        GetManyResponse<TData>
+    >;
     /**
      * Metadata query for `dataProvider`,
      */
@@ -67,13 +71,16 @@ export type UseManyProps<TData, TError> = {
  *
  * @see {@link https://refine.dev/docs/core/hooks/data/useMany} for more details.
  *
- * @typeParam TData - Result data of the query extends {@link https://refine.dev/docs/core/interfaceReferences#baserecord `BaseRecord`}
- * @typeParam TError - Custom error object that extends {@link https://refine.dev/docs/core/interfaceReferences#httperror `HttpError`}
+ * @typeParam TQueryFnData - Result data returned by the query function. Extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#baserecord `BaseRecord`}
+ * @typeParam TError - Custom error object that extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#httperror `HttpError`}
+ * @typeParam TData - Result data returned by the `select` function. Extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#baserecord `BaseRecord`}. Defaults to `TQueryFnData`
  *
  */
+
 export const useMany = <
-    TData extends BaseRecord = BaseRecord,
+    TQueryFnData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
+    TData extends BaseRecord = TQueryFnData,
 >({
     resource,
     ids,
@@ -86,7 +93,7 @@ export const useMany = <
     onLiveEvent,
     liveParams,
     dataProviderName,
-}: UseManyProps<TData, TError>): QueryObserverResult<
+}: UseManyProps<TQueryFnData, TError, TData>): QueryObserverResult<
     GetManyResponse<TData>
 > => {
     const { resources } = useResource();
@@ -128,13 +135,25 @@ export const useMany = <
         onLiveEvent,
     });
 
-    const queryResponse = useQuery<GetManyResponse<TData>, TError>(
+    const queryResponse = useQuery<
+        GetManyResponse<TQueryFnData>,
+        TError,
+        GetManyResponse<TData>
+    >(
         queryKey.many(ids),
         ({ queryKey, pageParam, signal }) => {
             if (getMany) {
                 return getMany({
                     resource,
                     ids,
+                    meta: {
+                        ...(pickNotDeprecated(meta, metaData) || {}),
+                        queryContext: {
+                            queryKey,
+                            pageParam,
+                            signal,
+                        },
+                    },
                     metaData: {
                         ...(pickNotDeprecated(meta, metaData) || {}),
                         queryContext: {
@@ -147,9 +166,17 @@ export const useMany = <
             } else {
                 return handleMultiple(
                     ids.map((id) =>
-                        getOne<TData>({
+                        getOne<TQueryFnData>({
                             resource,
                             id,
+                            meta: {
+                                ...(pickNotDeprecated(meta, metaData) || {}),
+                                queryContext: {
+                                    queryKey,
+                                    pageParam,
+                                    signal,
+                                },
+                            },
                             metaData: {
                                 ...(pickNotDeprecated(meta, metaData) || {}),
                                 queryContext: {

package/src/hooks/data/useOne.ts

@@ -29,7 +29,7 @@ import {
     useActiveAuthProvider,
 } from "@definitions";
 
-export type UseOneProps<TData, TError> = {
+export type UseOneProps<TQueryFnData, TError, TData> = {
     /**
      * Resource name for API data interactions
      */
@@ -42,7 +42,11 @@ export type UseOneProps<TData, TError> = {
     /**
      * react-query's [useQuery](https://tanstack.com/query/v4/docs/reference/useQuery) options
      */
-    queryOptions?: UseQueryOptions<GetOneResponse<TData>, TError>;
+    queryOptions?: UseQueryOptions<
+        GetOneResponse<TQueryFnData>,
+        TError,
+        GetOneResponse<TData>
+    >;
     /**
      * Metadata query for `dataProvider`,
      */
@@ -71,13 +75,16 @@ export type UseOneProps<TData, TError> = {
  *
  * @see {@link https://refine.dev/docs/core/hooks/data/useOne} for more details.
  *
- * @typeParam TData - Result data of the query extends {@link https://refine.dev/docs/api-references/interfaceReferences#baserecord `BaseRecord`}
- * @typeParam TError - Custom error object that extends {@link https://refine.dev/docs/api-references/interfaceReferences#httperror `HttpError`}
+ * @typeParam TQueryFnData - Result data returned by the query function. Extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#baserecord `BaseRecord`}
+ * @typeParam TError - Custom error object that extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#httperror `HttpError`}
+ * @typeParam TData - Result data returned by the `select` function. Extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#baserecord `BaseRecord`}. Defaults to `TQueryFnData`
  *
  */
+
 export const useOne = <
-    TData extends BaseRecord = BaseRecord,
+    TQueryFnData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
+    TData extends BaseRecord = TQueryFnData,
 >({
     resource,
     id,
@@ -90,7 +97,9 @@ export const useOne = <
     onLiveEvent,
     liveParams,
     dataProviderName,
-}: UseOneProps<TData, TError>): QueryObserverResult<GetOneResponse<TData>> => {
+}: UseOneProps<TQueryFnData, TError, TData>): QueryObserverResult<
+    GetOneResponse<TData>
+> => {
     const { resources } = useResource();
     const dataProvider = useDataProvider();
     const queryKey = queryKeys(
@@ -130,10 +139,14 @@ export const useOne = <
         onLiveEvent,
     });
 
-    const queryResponse = useQuery<GetOneResponse<TData>, TError>(
+    const queryResponse = useQuery<
+        GetOneResponse<TQueryFnData>,
+        TError,
+        GetOneResponse<TData>
+    >(
         queryKey.detail(id),
         ({ queryKey, pageParam, signal }) =>
-            getOne<TData>({
+            getOne<TQueryFnData>({
                 resource: resource!,
                 id: id!,
                 meta: {

package/src/hooks/form/useForm.ts

@@ -56,6 +56,7 @@ type ActionFormProps<
     TData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
     TVariables = {},
+    TSelectData extends BaseRecord = TData,
 > = {
     /**
      * Resource name for API data interactions
@@ -121,7 +122,11 @@ type ActionFormProps<
     /**
      * react-query's [useQuery](https://tanstack.com/query/v4/docs/reference/useQuery) options of useOne hook used while in edit mode.
      */
-    queryOptions?: UseQueryOptions<GetOneResponse<TData>, HttpError>;
+    queryOptions?: UseQueryOptions<
+        GetOneResponse<TData>,
+        TError,
+        GetOneResponse<TSelectData>
+    >;
     /**
      * react-query's [useMutation](https://tanstack.com/query/v4/docs/reference/useMutation) options of useCreate hook used while submitting in create and clone modes.
      */
@@ -150,17 +155,20 @@ export type UseFormProps<
     TData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
     TVariables = {},
-> = ActionFormProps<TData, TError, TVariables> & ActionParams & LiveModeProps;
+    TSelectData extends BaseRecord = TData,
+> = ActionFormProps<TData, TError, TVariables, TSelectData> &
+    ActionParams &
+    LiveModeProps;
 
 export type UseFormReturnType<
     TData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
     TVariables = {},
+    TSelectData extends BaseRecord = TData,
 > = {
     id?: BaseKey;
     setId: Dispatch<SetStateAction<BaseKey | undefined>>;
-
-    queryResult?: QueryObserverResult<GetOneResponse<TData>>;
+    queryResult?: QueryObserverResult<GetOneResponse<TSelectData>>;
     mutationResult:
         | UseUpdateReturnType<TData, TError, TVariables>
         | UseCreateReturnType<TData, TError, TVariables>;
@@ -190,6 +198,7 @@ export const useForm = <
     TData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
     TVariables = {},
+    TSelectData extends BaseRecord = TData,
 >({
     resource: resourceFromProps,
     action: actionFromProps,
@@ -211,11 +220,12 @@ export const useForm = <
     queryOptions,
     createMutationOptions,
     updateMutationOptions,
-}: UseFormProps<TData, TError, TVariables> = {}): UseFormReturnType<
+}: UseFormProps<
     TData,
     TError,
-    TVariables
-> => {
+    TVariables,
+    TSelectData
+> = {}): UseFormReturnType<TData, TError, TVariables, TSelectData> => {
     const { options } = useRefineContext();
     const { resources } = useResource();
     const routerType = useRouterType();
@@ -349,7 +359,7 @@ export const useForm = <
 
     const enableQuery = id !== undefined && (isEdit || isClone);
 
-    const queryResult = useOne<TData>({
+    const queryResult = useOne<TData, TError, TSelectData>({
         resource: resource?.name,
         id: id ?? "",
         queryOptions: {

package/src/hooks/show/useShow.ts

@@ -29,8 +29,9 @@ export type useShowReturnType<TData extends BaseRecord = BaseRecord> = {
 };
 
 export type useShowProps<
-    TData extends BaseRecord = BaseRecord,
+    TQueryFnData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
+    TData extends BaseRecord = TQueryFnData,
 > = {
     /**
      * Resource name for API data interactions
@@ -45,7 +46,11 @@ export type useShowProps<
     /**
      * react-query's [useQuery](https://tanstack.com/query/v4/docs/reference/useQuery) options
      */
-    queryOptions?: UseQueryOptions<GetOneResponse<TData>, TError>;
+    queryOptions?: UseQueryOptions<
+        GetOneResponse<TQueryFnData>,
+        TError,
+        GetOneResponse<TData>
+    >;
     /**
      * Additional meta data to pass to the data provider's `getOne`
      */
@@ -70,13 +75,20 @@ export type useShowProps<
 /**
  * `useShow` hook allows you to fetch the desired record.
  * It uses `getOne` method as query function from the dataProvider that is
- * passed to {@link https://refine.dev/docs/api-references/components/refine-config `<Refine>`}.
+ * passed to {@link https://refine.dev/docs/api-reference/core/components/refine-config/ `<Refine>`}.
  *
  * @see {@link https://refine.dev/docs/core/hooks/show/useShow} for more details.
+ *
+ * @typeParam TQueryFnData - Result data returned by the query function. Extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#baserecord `BaseRecord`}
+ * @typeParam TError - Custom error object that extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#httperror `HttpError`}
+ * @typeParam TData - Result data returned by the `select` function. Extends {@link https://refine.dev/docs/api-reference/core/interfaceReferences#baserecord `BaseRecord`}. Defaults to `TQueryFnData`
+ *
  */
+
 export const useShow = <
-    TData extends BaseRecord = BaseRecord,
+    TQueryFnData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
+    TData extends BaseRecord = TQueryFnData,
 >({
     resource: resourceFromProp,
     id,
@@ -88,7 +100,11 @@ export const useShow = <
     onLiveEvent,
     dataProviderName,
     queryOptions,
-}: useShowProps<TData, TError> = {}): useShowReturnType<TData> => {
+}: useShowProps<
+    TQueryFnData,
+    TError,
+    TData
+> = {}): useShowReturnType<TData> => {
     const routerType = useRouterType();
     const { resources } = useResource();
     const { useParams } = useRouterContext();
@@ -170,7 +186,7 @@ export const useShow = <
             `See https://refine.dev/docs/api-reference/core/hooks/show/useShow/#resource`,
     );
 
-    const queryResult = useOne<TData, TError>({
+    const queryResult = useOne<TQueryFnData, TError, TData>({
         resource: resource?.name,
         id: showId ?? "",
         queryOptions: {