tests(react-query): allow multiple types in query returns

Author: DogPawHat

packages/react-query/src/__tests__/usePrefetchQueries.test.tsx

@@ -6,23 +6,19 @@ import { createQueryClient, queryKey, renderWithClient, sleep } from './utils'
 
 import type { UseSuspenseQueryOptions } from '..'
 
-const generateQueryFn = (data: string) =>
-  vi
-    .fn<(...args: Array<any>) => Promise<string>>()
-    .mockImplementation(async () => {
-      await sleep(10)
+const generateQueryFn = <T,>(data: T) =>
+  vi.fn<(...args: Array<any>) => Promise<T>>().mockImplementation(async () => {
+    await sleep(10)
 
-      return data
-    })
+    return data
+  })
 
 describe('usePrefetchQueries', () => {
   const queryCache = new QueryCache()
   const queryClient = createQueryClient({ queryCache })
 
-  function Suspended<TData = unknown>(props: {
-    queriesOpts: Array<
-      UseSuspenseQueryOptions<TData, Error, TData, Array<string>>
-    >
+  function Suspended(props: {
+    queriesOpts: Array<UseSuspenseQueryOptions>
     children?: React.ReactNode
   }) {
     const state = useSuspenseQueries({
@@ -46,7 +42,7 @@ describe('usePrefetchQueries', () => {
 
     const queryOpts2 = {
       queryKey: queryKey(),
-      queryFn: generateQueryFn('prefetchQuery2'),
+      queryFn: generateQueryFn(2),
     }
 
     const componentQueryOpts1 = {
@@ -56,7 +52,7 @@ describe('usePrefetchQueries', () => {
 
     const componentQueryOpts2 = {
       ...queryOpts2,
-      queryFn: generateQueryFn('useSuspenseQuery2'),
+      queryFn: generateQueryFn(2),
     }
 
     function App() {
@@ -73,9 +69,7 @@ describe('usePrefetchQueries', () => {
 
     const rendered = renderWithClient(queryClient, <App />)
 
-    await waitFor(() =>
-      rendered.getByText('data: prefetchQuery1, prefetchQuery2'),
-    )
+    await waitFor(() => rendered.getByText('data: prefetchQuery1, 2'))
     expect(queryOpts1.queryFn).toHaveBeenCalledTimes(1)
     expect(queryOpts2.queryFn).toHaveBeenCalledTimes(1)
   })
@@ -88,7 +82,7 @@ describe('usePrefetchQueries', () => {
 
     const queryOpts2 = {
       queryKey: queryKey(),
-      queryFn: generateQueryFn('The usePrefetchQueries hook is smart! 2'),
+      queryFn: generateQueryFn(2),
     }
 
     function App() {
@@ -112,9 +106,7 @@ describe('usePrefetchQueries', () => {
 
     expect(rendered.queryByText('fetching: true')).not.toBeInTheDocument()
     await waitFor(() =>
-      rendered.getByText(
-        'data: The usePrefetchQueries hook is smart! 1, The usePrefetchQueries hook is smart! 2',
-      ),
+      rendered.getByText('data: The usePrefetchQueries hook is smart! 1, 2'),
     )
     expect(queryOpts1.queryFn).not.toHaveBeenCalled()
     expect(queryOpts2.queryFn).not.toHaveBeenCalled()
@@ -128,7 +120,7 @@ describe('usePrefetchQueries', () => {
 
     const queryOpts2 = {
       queryKey: queryKey(),
-      queryFn: generateQueryFn('The usePrefetchQueries hook is smart! 2'),
+      queryFn: generateQueryFn(2),
     }
 
     function App() {
@@ -150,9 +142,7 @@ describe('usePrefetchQueries', () => {
     const rendered = renderWithClient(queryClient, <App />)
 
     await waitFor(() =>
-      rendered.getByText(
-        'data: The usePrefetchQueries hook is smart! 1, The usePrefetchQueries hook is smart! 2',
-      ),
+      rendered.getByText('data: The usePrefetchQueries hook is smart! 1, 2'),
     )
     expect(queryOpts1.queryFn).not.toHaveBeenCalled()
     expect(queryOpts2.queryFn).toHaveBeenCalledTimes(1)
@@ -166,7 +156,7 @@ describe('usePrefetchQueries', () => {
 
     const queryOpts2 = {
       queryKey: queryKey(),
-      queryFn: generateQueryFn('prefetchedQuery2'),
+      queryFn: generateQueryFn(2),
     }
 
     function Prefetch({ children }: { children: React.ReactNode }) {
@@ -187,9 +177,7 @@ describe('usePrefetchQueries', () => {
     }
 
     const rendered = renderWithClient(queryClient, <App />)
-    await waitFor(() =>
-      rendered.getByText('data: prefetchedQuery1, prefetchedQuery2'),
-    )
+    await waitFor(() => rendered.getByText('data: prefetchedQuery1, 2'))
     expect(queryOpts1.queryFn).toHaveBeenCalledTimes(1)
     expect(queryOpts2.queryFn).toHaveBeenCalledTimes(1)
   })

packages/react-query/tsconfig.vitest-temp.json

@@ -0,0 +1,71 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "compilerOptions": {
+    "allowJs": true,
+    "allowSyntheticDefaultImports": true,
+    "allowUnreachableCode": false,
+    "allowUnusedLabels": false,
+    "checkJs": true,
+    "composite": true,
+    "customConditions": [
+      "@tanstack/custom-condition"
+    ],
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": false,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "incremental": true,
+    "isolatedModules": true,
+    "lib": [
+      "DOM",
+      "DOM.Iterable",
+      "ES2022"
+    ],
+    "module": "es2022",
+    "moduleResolution": "bundler",
+    "noEmit": false,
+    "noImplicitReturns": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "target": "es2020",
+    "outDir": "./dist-ts",
+    "rootDir": "./",
+    "baseUrl": "./",
+    "jsx": "react-jsx",
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "strictBindCallApply": true,
+    "strictPropertyInitialization": true,
+    "strictBuiltinIteratorReturn": true,
+    "alwaysStrict": true,
+    "useUnknownInCatchVariables": true,
+    "resolvePackageJsonExports": true,
+    "resolvePackageJsonImports": true,
+    "preserveConstEnums": true,
+    "tsBuildInfoFile": "/home/dogpawhat/Development/tanstack/query/node_modules/.pnpm/vitest@3.1.1_@types+debug@4.1.12_@types+node@22.14.0_jiti@2.4.2_jsdom@25.0.1_less@4.2.2_d19a37a9b627b186f6ea2a1304dc7011/node_modules/vitest/dist/chunks/tsconfig.tmp.tsbuildinfo"
+  },
+  "include": [
+    "src",
+    "*.config.js",
+    "*.config.ts",
+    "package.json"
+  ],
+  "references": [
+    {
+      "path": "../query-core"
+    },
+    {
+      "path": "../query-persist-client-core"
+    }
+  ],
+  "exclude": [
+    "./dist-ts"
+  ]
+}