fix(solid-query): export queryOptions without type errors (#9668)

* fix(solid-query): add missing generic error type

* refactor(solid-query): remove unused generic type

* test(solid-query): add case for error tag

---------

Co-authored-by: Dominik Dorfmeister <[email protected]>

Author: Zen-cronic

packages/solid-query/src/__tests__/queryOptions.test-d.tsx

@@ -1,5 +1,10 @@
 import { assertType, describe, expectTypeOf, it } from 'vitest'
-import { QueryClient, dataTagSymbol, skipToken } from '@tanstack/query-core'
+import {
+  QueryClient,
+  dataTagErrorSymbol,
+  dataTagSymbol,
+  skipToken,
+} from '@tanstack/query-core'
 import { useQuery } from '../useQuery'
 import { queryOptions } from '../queryOptions'
 
@@ -74,6 +79,14 @@ describe('queryOptions', () => {
 
     expectTypeOf(queryKey[dataTagSymbol]).toEqualTypeOf<number>()
   })
+  it('should tag the queryKey with the default error type', () => {
+    const { queryKey } = queryOptions({
+      queryKey: ['key'],
+      queryFn: () => Promise.resolve(1),
+    })
+
+    expectTypeOf(queryKey[dataTagErrorSymbol]).toEqualTypeOf<Error>()
+  })
   it('should return the proper type when passed to getQueryData', () => {
     const { queryKey } = queryOptions({
       queryKey: ['key'],

packages/solid-query/src/queryOptions.ts

@@ -29,39 +29,29 @@ export function queryOptions<
   TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
-  TOptions extends ReturnType<
-    UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>
-  > = ReturnType<
-    UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>
-  >,
 >(
   options: ReturnType<
     UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>
   >,
 ): ReturnType<
   UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>
 > & {
-  queryKey: DataTag<TQueryKey, TQueryFnData>
+  queryKey: DataTag<TQueryKey, TQueryFnData, TError>
 }
 
 export function queryOptions<
   TQueryFnData = unknown,
   TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
-  TOptions extends ReturnType<
-    DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>
-  > = ReturnType<
-    DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>
-  >,
 >(
   options: ReturnType<
     DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>
   >,
 ): ReturnType<
   DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>
 > & {
-  queryKey: DataTag<TQueryKey, TQueryFnData>
+  queryKey: DataTag<TQueryKey, TQueryFnData, TError>
 }
 
 export function queryOptions(options: unknown) {