fix(query): ensure PageParam is typed without select (#153)

Also update tests for infiniteOptions with initialParams is undefined

Author: unnoq

packages/react-query/src/procedure-utils.test-d.ts

@@ -1,6 +1,6 @@
 import type { Client } from '@orpc/client'
 import type { ErrorFromErrorMap } from '@orpc/contract'
-import type { InfiniteData } from '@tanstack/react-query'
+import type { GetNextPageParamFunction, InfiniteData } from '@tanstack/react-query'
 import type { baseErrorMap } from '../../contract/tests/shared'
 import type { ProcedureUtils } from './procedure-utils'
 import { useInfiniteQuery, useMutation, useQueries, useQuery, useSuspenseInfiniteQuery, useSuspenseQuery } from '@tanstack/react-query'
@@ -119,7 +119,7 @@ describe('ProcedureUtils', () => {
   })
 
   describe('.infiniteOptions', () => {
-    const getNextPageParam = {} as () => number
+    const getNextPageParam = {} as GetNextPageParamFunction<number, UtilsOutput>
     const initialPageParam = 1
 
     it('can optional context', () => {
@@ -157,11 +157,10 @@ describe('ProcedureUtils', () => {
       })
 
       utils.infiniteOptions({
-        input: (pageParam) => {
-          expectTypeOf(pageParam).toEqualTypeOf<number | undefined>()
+        input: (pageParam: number | undefined) => {
           return { cursor: pageParam }
         },
-        getNextPageParam,
+        getNextPageParam: lastPage => 1,
         initialPageParam: undefined,
       })
 

packages/react-query/src/procedure-utils.ts

@@ -13,7 +13,7 @@ export interface ProcedureUtils<TClientContext extends ClientContext, TInput, TO
     >
   ): NoInfer<U & QueryOptionsBase<TOutput, TError>>
 
-  infiniteOptions<U, UPageParam, USelectData = InfiniteData<TOutput>>(
+  infiniteOptions<U, UPageParam, USelectData = InfiniteData<TOutput, UPageParam>>(
     options: U & InfiniteOptionsIn<TClientContext, TInput, TOutput, TError, USelectData, UPageParam>
   ): NoInfer<U & InfiniteOptionsBase<TOutput, TError, UPageParam>>
 

packages/vue-query/src/procedure-utils.test-d.ts

@@ -1,6 +1,6 @@
 import type { Client } from '@orpc/client'
 import type { ErrorFromErrorMap } from '@orpc/contract'
-import type { InfiniteData } from '@tanstack/vue-query'
+import type { GetNextPageParamFunction, InfiniteData } from '@tanstack/vue-query'
 import type { baseErrorMap } from '../../contract/tests/shared'
 import type { ProcedureUtils } from './procedure-utils'
 import { useInfiniteQuery, useMutation, useQueries, useQuery } from '@tanstack/vue-query'
@@ -113,7 +113,7 @@ describe('ProcedureUtils', () => {
   })
 
   describe('.infiniteOptions', () => {
-    const getNextPageParam = {} as () => number
+    const getNextPageParam = {} as GetNextPageParamFunction<number, UtilsOutput>
     const initialPageParam = 1
 
     it('can optional context', () => {
@@ -151,11 +151,10 @@ describe('ProcedureUtils', () => {
       })
 
       utils.infiniteOptions({
-        input: (pageParam) => {
-          expectTypeOf(pageParam).toEqualTypeOf<number | undefined>()
+        input: (pageParam: number | undefined) => {
           return { cursor: pageParam }
         },
-        getNextPageParam,
+        getNextPageParam: lastPage => 1,
         initialPageParam: undefined,
       })
 

packages/vue-query/src/procedure-utils.ts

@@ -15,7 +15,7 @@ export interface ProcedureUtils<TClientContext extends ClientContext, TInput, TO
     >
   ): NoInfer<U & QueryOptionsBase<TOutput, TError>>
 
-  infiniteOptions<U, UPageParam, USelectData = InfiniteData<TOutput>>(
+  infiniteOptions<U, UPageParam, USelectData = InfiniteData<TOutput, UPageParam>>(
     options: U & InfiniteOptionsIn<TClientContext, TInput, TOutput, TError, USelectData, UPageParam>
   ): NoInfer<U & InfiniteOptionsBase<TOutput, TError, UPageParam>>