fix(types): repair wrong types passed to DataTag (#6699)

* fix: repair wrong types passed to `DataTag`

* test: remove introduced changes and add test for the fixed behavior

* Update packages/angular-query-experimental/src/__tests__/query-options.test-d.ts

* Update packages/angular-query-experimental/src/__tests__/query-options.test-d.ts

---------

Co-authored-by: Dominik Dorfmeister <office@dorfmeister.cc>

Author: lukemorales

packages/angular-query-experimental/src/__tests__/query-options.test-d.ts

@@ -71,6 +71,16 @@ test('should tag the queryKey with unknown if there is no queryFn', () => {
   assertType<unknown>(queryKey[dataTagSymbol])
 })
 
+test('should tag the queryKey with the result type of the QueryFn if select is used', () => {
+  const { queryKey } = queryOptions({
+    queryKey: ['key'],
+    queryFn: () => Promise.resolve(5),
+    select: (data) => data.toString(),
+  })
+
+  assertType<number>(queryKey[dataTagSymbol])
+})
+
 test('should return the proper type when passed to getQueryData', () => {
   const { queryKey } = queryOptions({
     queryKey: ['key'],

packages/angular-query-experimental/src/query-options.ts

@@ -31,7 +31,7 @@ export function queryOptions<
 >(
   options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,
 ): UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey> & {
-  queryKey: DataTag<TQueryKey, TData>
+  queryKey: DataTag<TQueryKey, TQueryFnData>
 }
 
 export function queryOptions<
@@ -42,7 +42,7 @@ export function queryOptions<
 >(
   options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,
 ): DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey> & {
-  queryKey: DataTag<TQueryKey, TData>
+  queryKey: DataTag<TQueryKey, TQueryFnData>
 }
 
 export function queryOptions(options: unknown) {

packages/react-query/src/__tests__/infiniteQueryOptions.types.test.tsx

@@ -117,6 +117,22 @@ describe('queryOptions', () => {
       return result
     })
   })
+  it('should tag the queryKey with the result type of the QueryFn if select is used', () => {
+    doNotExecute(() => {
+      const { queryKey } = infiniteQueryOptions({
+        queryKey: ['key'],
+        queryFn: () => Promise.resolve('string'),
+        select: (data) => data.pages,
+        getNextPageParam: () => 1,
+        initialPageParam: 1,
+      })
+
+      const result: Expect<
+        Equal<(typeof queryKey)[typeof dataTagSymbol], InfiniteData<string>>
+      > = true
+      return result
+    })
+  })
   it('should return the proper type when passed to getQueryData', () => {
     doNotExecute(() => {
       const { queryKey } = infiniteQueryOptions({

packages/react-query/src/__tests__/queryOptions.types.test.tsx

@@ -124,6 +124,20 @@ describe('queryOptions', () => {
       return result
     })
   })
+  it('should tag the queryKey with the result type of the QueryFn if select is used', () => {
+    doNotExecute(() => {
+      const { queryKey } = queryOptions({
+        queryKey: ['key'],
+        queryFn: () => Promise.resolve(5),
+        select: (data) => data.toString(),
+      })
+
+      const result: Expect<
+        Equal<(typeof queryKey)[typeof dataTagSymbol], number>
+      > = true
+      return result
+    })
+  })
   it('should return the proper type when passed to getQueryData', () => {
     doNotExecute(() => {
       const { queryKey } = queryOptions({

packages/react-query/src/infiniteQueryOptions.ts

@@ -62,7 +62,7 @@ export function infiniteQueryOptions<
   TQueryKey,
   TPageParam
 > & {
-  queryKey: DataTag<TQueryKey, TData>
+  queryKey: DataTag<TQueryKey, InfiniteData<TQueryFnData>>
 }
 
 export function infiniteQueryOptions<
@@ -86,7 +86,7 @@ export function infiniteQueryOptions<
   TQueryKey,
   TPageParam
 > & {
-  queryKey: DataTag<TQueryKey, TData>
+  queryKey: DataTag<TQueryKey, InfiniteData<TQueryFnData>>
 }
 
 export function infiniteQueryOptions(options: unknown) {

packages/react-query/src/queryOptions.ts

@@ -31,7 +31,7 @@ export function queryOptions<
 >(
   options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,
 ): UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey> & {
-  queryKey: DataTag<TQueryKey, TData>
+  queryKey: DataTag<TQueryKey, TQueryFnData>
 }
 
 export function queryOptions<
@@ -42,7 +42,7 @@ export function queryOptions<
 >(
   options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,
 ): DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey> & {
-  queryKey: DataTag<TQueryKey, TData>
+  queryKey: DataTag<TQueryKey, TQueryFnData>
 }
 
 export function queryOptions(options: unknown) {

packages/vue-query/src/__tests__/queryOptions.types.test.ts

@@ -83,6 +83,20 @@ describe('queryOptions', () => {
       return result
     })
   })
+  it('should tag the queryKey with the result type of the QueryFn if select is used', () => {
+    doNotExecute(() => {
+      const { queryKey } = queryOptions({
+        queryKey: ['key'],
+        queryFn: () => Promise.resolve(5),
+        select: (data) => data.toString(),
+      })
+
+      const result: Expect<
+        Equal<(typeof queryKey)[typeof dataTagSymbol], number>
+      > = true
+      return result
+    })
+  })
   it('should return the proper type when passed to getQueryData', () => {
     doNotExecute(() => {
       const { queryKey } = queryOptions({

packages/vue-query/src/queryOptions.ts

@@ -12,7 +12,7 @@ export function queryOptions<
 >(
   options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
 ): UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
-  queryKey: DataTag<TQueryKey, TData>
+  queryKey: DataTag<TQueryKey, TQueryFnData>
 }
 
 export function queryOptions<
@@ -23,7 +23,7 @@ export function queryOptions<
 >(
   options: DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
 ): DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
-  queryKey: DataTag<TQueryKey, TData>
+  queryKey: DataTag<TQueryKey, TQueryFnData>
 }
 
 export function queryOptions(options: unknown) {