@orpc/react 0.0.0-unsafe-pr-2-20241118033608 → 0.0.0-unsafe-pr-9-20241121090958

package/src/procedure-hooks.ts

@@ -1,8 +1,9 @@
 import type { Schema, SchemaInput, SchemaOutput } from '@orpc/contract'
+import type { SchemaInputForInfiniteQuery } from './types'
 import {
+  get,
   type PartialOnUndefinedDeep,
   type SetOptional,
-  get,
 } from '@orpc/shared'
 import {
   type DefaultError,
@@ -10,35 +11,34 @@ import {
   type FetchQueryOptions,
   type InfiniteData,
   type QueryKey,
+  useInfiniteQuery,
   type UseInfiniteQueryOptions,
   type UseInfiniteQueryResult,
+  useMutation,
   type UseMutationOptions,
   type UseMutationResult,
+  usePrefetchInfiniteQuery,
+  usePrefetchQuery,
+  useQuery,
   type UseQueryOptions,
   type UseQueryResult,
+  useSuspenseInfiniteQuery,
   type UseSuspenseInfiniteQueryOptions,
   type UseSuspenseInfiniteQueryResult,
+  useSuspenseQuery,
   type UseSuspenseQueryOptions,
   type UseSuspenseQueryResult,
-  useInfiniteQuery,
-  useMutation,
-  usePrefetchInfiniteQuery,
-  usePrefetchQuery,
-  useQuery,
-  useSuspenseInfiniteQuery,
-  useSuspenseQuery,
 } from '@tanstack/react-query'
 import { orpcPathSymbol } from './orpc-path'
 import { type ORPCContext, useORPCContext } from './react-context'
 import { getMutationKeyFromPath, getQueryKeyFromPath } from './tanstack-key'
-import type { SchemaInputForInfiniteQuery } from './types'
 
 export interface ProcedureHooks<
   TInputSchema extends Schema,
   TOutputSchema extends Schema,
   THandlerOutput extends SchemaOutput<TOutputSchema>,
 > {
-  useQuery<USelectData = SchemaOutput<TOutputSchema, THandlerOutput>>(
+  useQuery: <USelectData = SchemaOutput<TOutputSchema, THandlerOutput>>(
     input: SchemaInput<TInputSchema>,
     options?: SetOptional<
       UseQueryOptions<
@@ -48,8 +48,8 @@ export interface ProcedureHooks<
       >,
       'queryFn' | 'queryKey'
     >,
-  ): UseQueryResult<USelectData>
-  useInfiniteQuery<
+  ) => UseQueryResult<USelectData>
+  useInfiniteQuery: <
     USelectData = InfiniteData<
       SchemaOutput<TOutputSchema, THandlerOutput>,
       SchemaInput<TInputSchema>['cursor']
@@ -70,9 +70,9 @@ export interface ProcedureHooks<
         input: SchemaInputForInfiniteQuery<TInputSchema>
       }
     >,
-  ): UseInfiniteQueryResult<USelectData>
+  ) => UseInfiniteQueryResult<USelectData>
 
-  useSuspenseQuery<USelectData = SchemaOutput<TOutputSchema, THandlerOutput>>(
+  useSuspenseQuery: <USelectData = SchemaOutput<TOutputSchema, THandlerOutput>>(
     input: SchemaInput<TInputSchema>,
     options?: SetOptional<
       UseSuspenseQueryOptions<
@@ -82,8 +82,8 @@ export interface ProcedureHooks<
       >,
       'queryFn' | 'queryKey'
     >,
-  ): UseSuspenseQueryResult<USelectData>
-  useSuspenseInfiniteQuery<
+  ) => UseSuspenseQueryResult<USelectData>
+  useSuspenseInfiniteQuery: <
     USelectData = InfiniteData<
       SchemaOutput<TOutputSchema, THandlerOutput>,
       SchemaInput<TInputSchema>['cursor']
@@ -104,13 +104,13 @@ export interface ProcedureHooks<
         input: SchemaInputForInfiniteQuery<TInputSchema>
       }
     >,
-  ): UseSuspenseInfiniteQueryResult<USelectData>
+  ) => UseSuspenseInfiniteQueryResult<USelectData>
 
-  usePrefetchQuery(
+  usePrefetchQuery: (
     input: SchemaInput<TInputSchema>,
     options?: FetchQueryOptions<SchemaOutput<TOutputSchema, THandlerOutput>>,
-  ): void
-  usePrefetchInfiniteQuery(
+  ) => void
+  usePrefetchInfiniteQuery: (
     options: PartialOnUndefinedDeep<
       SetOptional<
         FetchInfiniteQueryOptions<
@@ -125,9 +125,9 @@ export interface ProcedureHooks<
         input: SchemaInputForInfiniteQuery<TInputSchema>
       }
     >,
-  ): void
+  ) => void
 
-  useMutation(
+  useMutation: (
     options?: SetOptional<
       UseMutationOptions<
         SchemaOutput<TOutputSchema, THandlerOutput>,
@@ -136,7 +136,7 @@ export interface ProcedureHooks<
       >,
       'mutationFn' | 'mutationKey'
     >,
-  ): UseMutationResult<
+  ) => UseMutationResult<
     SchemaOutput<TOutputSchema, THandlerOutput>,
     DefaultError,
     SchemaInput<TInputSchema>
@@ -158,7 +158,7 @@ export function createProcedureHooks<
   TInputSchema extends Schema = undefined,
   TOutputSchema extends Schema = undefined,
   THandlerOutput extends
-    SchemaOutput<TOutputSchema> = SchemaOutput<TOutputSchema>,
+  SchemaOutput<TOutputSchema> = SchemaOutput<TOutputSchema>,
 >(
   options: CreateProcedureHooksOptions,
 ): ProcedureHooks<TInputSchema, TOutputSchema, THandlerOutput> {
@@ -261,7 +261,7 @@ export function createProcedureHooks<
       return useMutation(
         {
           mutationKey: getMutationKeyFromPath(options.path),
-          mutationFn: (input) => client(input),
+          mutationFn: input => client(input),
           ...options_,
         },
         context.queryClient,

package/src/procedure-utils.test-d.ts

@@ -233,9 +233,9 @@ describe('getInfiniteQueryData', () => {
     expectTypeOf(data).toEqualTypeOf<
       | undefined
       | InfiniteData<
-          SchemaOutput<typeof UserListOutputSchema>,
+        SchemaOutput<typeof UserListOutputSchema>,
           number | undefined
-        >
+      >
     >()
   })
 })
@@ -377,11 +377,11 @@ describe('getInfiniteQueryState', () => {
     expectTypeOf(data).toEqualTypeOf<
       | undefined
       | QueryState<
-          InfiniteData<
-            SchemaOutput<typeof UserListOutputSchema>,
+        InfiniteData<
+          SchemaOutput<typeof UserListOutputSchema>,
             number | undefined
-          >
         >
+      >
     >()
   })
 })
@@ -444,9 +444,9 @@ describe('setInfiniteQueryData', () => {
       expectTypeOf(data).toEqualTypeOf<
         | undefined
         | InfiniteData<
-            SchemaOutput<typeof UserListOutputSchema>,
+          SchemaOutput<typeof UserListOutputSchema>,
             number | undefined
-          >
+        >
       >()
 
       return {
@@ -458,9 +458,9 @@ describe('setInfiniteQueryData', () => {
     expectTypeOf(data).toEqualTypeOf<
       | undefined
       | InfiniteData<
-          SchemaOutput<typeof UserListOutputSchema>,
+        SchemaOutput<typeof UserListOutputSchema>,
           number | undefined
-        >
+      >
     >()
   })
 

package/src/procedure-utils.test.tsx

@@ -9,7 +9,7 @@ describe('fetchQuery', () => {
   const utils = createProcedureUtils({
     client: orpcClient.user.find,
     path: ['user', 'find'],
-    queryClient: queryClient,
+    queryClient,
   })
 
   it('on success', async () => {
@@ -40,7 +40,7 @@ describe('fetchInfiniteQuery', () => {
   const utils = createProcedureUtils({
     client: orpcClient.user.list,
     path: ['user', 'list'],
-    queryClient: queryClient,
+    queryClient,
   })
 
   it('on success', async () => {
@@ -76,7 +76,7 @@ describe('prefetchQuery', () => {
   const utils = createProcedureUtils({
     client: orpcClient.user.find,
     path: ['user', 'find'],
-    queryClient: queryClient,
+    queryClient,
   })
 
   it('on success', async () => {
@@ -109,7 +109,7 @@ describe('prefetchInfiniteQuery', () => {
   const utils = createProcedureUtils({
     client: orpcClient.user.list,
     path: ['user', 'list'],
-    queryClient: queryClient,
+    queryClient,
   })
 
   it('on success', async () => {
@@ -144,7 +144,7 @@ describe('ensureQueryData', () => {
   const utils = createProcedureUtils({
     client: orpcClient.user.find,
     path: ['user', 'find'],
-    queryClient: queryClient,
+    queryClient,
   })
 
   it('on success', async () => {
@@ -175,7 +175,7 @@ describe('ensureInfiniteQuery', () => {
   const utils = createProcedureUtils({
     client: orpcClient.user.list,
     path: ['user', 'list'],
-    queryClient: queryClient,
+    queryClient,
   })
 
   it('on success', async () => {
@@ -211,7 +211,7 @@ describe('getQueryData', () => {
   const utils = createProcedureUtils({
     client: orpcClient.user.find,
     path: ['user', 'find'],
-    queryClient: queryClient,
+    queryClient,
   })
 
   it('on success', async () => {
@@ -225,7 +225,7 @@ describe('getInfiniteQueryData', () => {
   const utils = createProcedureUtils({
     client: orpcClient.user.list,
     path: ['user', 'list'],
-    queryClient: queryClient,
+    queryClient,
   })
 
   it('on success', async () => {
@@ -239,7 +239,7 @@ describe('getQueryState', () => {
   const utils = createProcedureUtils({
     client: orpcClient.user.find,
     path: ['user', 'find'],
-    queryClient: queryClient,
+    queryClient,
   })
 
   it('on success', async () => {
@@ -256,7 +256,7 @@ describe('getInfiniteQueryState', () => {
   const utils = createProcedureUtils({
     client: orpcClient.user.list,
     path: ['user', 'list'],
-    queryClient: queryClient,
+    queryClient,
   })
 
   it('on success', async () => {
@@ -273,7 +273,7 @@ describe('setQueryData', () => {
   const utils = createProcedureUtils({
     client: orpcClient.user.find,
     path: ['user', 'find'],
-    queryClient: queryClient,
+    queryClient,
   })
 
   it('on success', async () => {
@@ -299,11 +299,11 @@ describe('setQueryData', () => {
   })
 })
 
-describe('getInfiniteQueryData', () => {
+describe('getInfiniteQueryData 2', () => {
   const utils = createProcedureUtils({
     client: orpcClient.user.list,
     path: ['user', 'list'],
-    queryClient: queryClient,
+    queryClient,
   })
 
   it('on success', async () => {

package/src/procedure-utils.ts

@@ -14,22 +14,22 @@ import type {
   SetDataOptions,
   Updater,
 } from '@tanstack/react-query'
-import { getQueryKeyFromPath } from './tanstack-key'
 import type { SchemaInputForInfiniteQuery } from './types'
+import { getQueryKeyFromPath } from './tanstack-key'
 
 export interface ProcedureUtils<
   TInputSchema extends Schema,
   TOutputSchema extends Schema,
   THandlerOutput extends SchemaOutput<TOutputSchema>,
 > {
-  fetchQuery(
+  fetchQuery: (
     input: SchemaInput<TInputSchema>,
     options?: SetOptional<
       FetchQueryOptions<SchemaOutput<TOutputSchema, THandlerOutput>>,
       'queryKey' | 'queryFn'
     >,
-  ): Promise<SchemaOutput<TOutputSchema, THandlerOutput>>
-  fetchInfiniteQuery(
+  ) => Promise<SchemaOutput<TOutputSchema, THandlerOutput>>
+  fetchInfiniteQuery: (
     options: PartialOnUndefinedDeep<
       SetOptional<
         FetchInfiniteQueryOptions<
@@ -44,21 +44,21 @@ export interface ProcedureUtils<
         input: SchemaInputForInfiniteQuery<TInputSchema>
       }
     >,
-  ): Promise<
+  ) => Promise<
     InfiniteData<
       SchemaOutput<TOutputSchema, THandlerOutput>,
       SchemaInput<TInputSchema>['cursor']
     >
   >
 
-  prefetchQuery(
+  prefetchQuery: (
     input: SchemaInput<TInputSchema>,
     options?: SetOptional<
       FetchQueryOptions<SchemaOutput<TOutputSchema, THandlerOutput>>,
       'queryKey' | 'queryFn'
     >,
-  ): Promise<void>
-  prefetchInfiniteQuery(
+  ) => Promise<void>
+  prefetchInfiniteQuery: (
     options: PartialOnUndefinedDeep<
       SetOptional<
         FetchInfiniteQueryOptions<
@@ -73,28 +73,27 @@ export interface ProcedureUtils<
         input: SchemaInputForInfiniteQuery<TInputSchema>
       }
     >,
-  ): Promise<void>
+  ) => Promise<void>
 
-  getQueryData(
+  getQueryData: (
     input: SchemaInput<TInputSchema>,
-  ): SchemaOutput<TOutputSchema, THandlerOutput> | undefined
-  getInfiniteQueryData(
+  ) => SchemaOutput<TOutputSchema, THandlerOutput> | undefined
+  getInfiniteQueryData: (
     input: SchemaInputForInfiniteQuery<TInputSchema>,
-  ):
-    | InfiniteData<
-        SchemaOutput<TOutputSchema, THandlerOutput>,
-        SchemaInput<TInputSchema>['cursor']
-      >
-    | undefined
+  ) => | InfiniteData<
+    SchemaOutput<TOutputSchema, THandlerOutput>,
+    SchemaInput<TInputSchema>['cursor']
+  >
+  | undefined
 
-  ensureQueryData(
+  ensureQueryData: (
     input: SchemaInput<TInputSchema>,
     options?: SetOptional<
       EnsureQueryDataOptions<SchemaOutput<TOutputSchema, THandlerOutput>>,
       'queryFn' | 'queryKey'
     >,
-  ): Promise<SchemaOutput<TOutputSchema, THandlerOutput>>
-  ensureInfiniteQueryData(
+  ) => Promise<SchemaOutput<TOutputSchema, THandlerOutput>>
+  ensureInfiniteQueryData: (
     options: PartialOnUndefinedDeep<
       SetOptional<
         EnsureInfiniteQueryDataOptions<
@@ -109,63 +108,61 @@ export interface ProcedureUtils<
         input: SchemaInputForInfiniteQuery<TInputSchema>
       }
     >,
-  ): Promise<
+  ) => Promise<
     InfiniteData<
       SchemaOutput<TOutputSchema, THandlerOutput>,
       SchemaInput<TInputSchema>['cursor']
     >
   >
 
-  getQueryState(
+  getQueryState: (
     input: SchemaInput<TInputSchema>,
-  ): QueryState<SchemaOutput<TOutputSchema, THandlerOutput>> | undefined
-  getInfiniteQueryState(
+  ) => QueryState<SchemaOutput<TOutputSchema, THandlerOutput>> | undefined
+  getInfiniteQueryState: (
     input: SchemaInputForInfiniteQuery<TInputSchema>,
-  ):
-    | QueryState<
-        InfiniteData<
-          SchemaOutput<TOutputSchema, THandlerOutput>,
-          SchemaInput<TInputSchema>['cursor']
-        >
-      >
-    | undefined
+  ) => | QueryState<
+    InfiniteData<
+      SchemaOutput<TOutputSchema, THandlerOutput>,
+      SchemaInput<TInputSchema>['cursor']
+    >
+  >
+  | undefined
 
-  setQueryData(
+  setQueryData: (
     input: SchemaInput<TInputSchema>,
     updater: Updater<
       SchemaOutput<TOutputSchema, THandlerOutput> | undefined,
       SchemaOutput<TOutputSchema, THandlerOutput> | undefined
     >,
     options?: SetDataOptions,
-  ): SchemaOutput<TOutputSchema, THandlerOutput> | undefined
-  setInfiniteQueryData(
+  ) => SchemaOutput<TOutputSchema, THandlerOutput> | undefined
+  setInfiniteQueryData: (
     input: SchemaInputForInfiniteQuery<TInputSchema>,
     updater: Updater<
       | InfiniteData<
-          SchemaOutput<TOutputSchema, THandlerOutput>,
-          SchemaInput<TInputSchema>['cursor']
-        >
+        SchemaOutput<TOutputSchema, THandlerOutput>,
+        SchemaInput<TInputSchema>['cursor']
+      >
       | undefined,
       | InfiniteData<
-          SchemaOutput<TOutputSchema, THandlerOutput>,
-          SchemaInput<TInputSchema>['cursor']
-        >
-      | undefined
-    >,
-    options?: SetDataOptions,
-  ):
-    | InfiniteData<
         SchemaOutput<TOutputSchema, THandlerOutput>,
         SchemaInput<TInputSchema>['cursor']
       >
-    | undefined
+      | undefined
+    >,
+    options?: SetDataOptions,
+  ) => | InfiniteData<
+    SchemaOutput<TOutputSchema, THandlerOutput>,
+    SchemaInput<TInputSchema>['cursor']
+  >
+  | undefined
 }
 
 export interface CreateProcedureUtilsOptions<
   TInputSchema extends Schema = undefined,
   TOutputSchema extends Schema = undefined,
   THandlerOutput extends
-    SchemaOutput<TOutputSchema> = SchemaOutput<TOutputSchema>,
+  SchemaOutput<TOutputSchema> = SchemaOutput<TOutputSchema>,
 > {
   client: ProcedureClient<TInputSchema, TOutputSchema, THandlerOutput>
   queryClient: QueryClient

package/src/react-hooks.ts

@@ -4,33 +4,25 @@ import type {
   SchemaOutput,
 } from '@orpc/contract'
 import type { Procedure, Router } from '@orpc/server'
-import { type GeneralHooks, createGeneralHooks } from './general-hooks'
-import { orpcPathSymbol } from './orpc-path'
-import { type ProcedureHooks, createProcedureHooks } from './procedure-hooks'
 import type { ORPCContext } from './react-context'
+import { createGeneralHooks, type GeneralHooks } from './general-hooks'
+import { orpcPathSymbol } from './orpc-path'
+import { createProcedureHooks, type ProcedureHooks } from './procedure-hooks'
 
 export type ORPCHooksWithContractRouter<TRouter extends ContractRouter> = {
   [K in keyof TRouter]: TRouter[K] extends ContractProcedure<
     infer UInputSchema,
     infer UOutputSchema
   >
-    ? ProcedureHooks<UInputSchema, UOutputSchema, SchemaOutput<UOutputSchema>> &
-        GeneralHooks<UInputSchema, UOutputSchema, SchemaOutput<UOutputSchema>>
+    ? ProcedureHooks<UInputSchema, UOutputSchema, SchemaOutput<UOutputSchema>> & GeneralHooks<UInputSchema, UOutputSchema, SchemaOutput<UOutputSchema>>
     : TRouter[K] extends ContractRouter
       ? ORPCHooksWithContractRouter<TRouter[K]>
       : never
 } & GeneralHooks<undefined, undefined, unknown>
 
 export type ORPCHooksWithRouter<TRouter extends Router<any>> = {
-  [K in keyof TRouter]: TRouter[K] extends Procedure<
-    any,
-    any,
-    infer UInputSchema,
-    infer UOutputSchema,
-    infer UHandlerOutput
-  >
-    ? ProcedureHooks<UInputSchema, UOutputSchema, UHandlerOutput> &
-        GeneralHooks<UInputSchema, UOutputSchema, UHandlerOutput>
+  [K in keyof TRouter]: TRouter[K] extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UHandlerOutput>
+    ? ProcedureHooks<UInputSchema, UOutputSchema, UHandlerOutput> & GeneralHooks<UInputSchema, UOutputSchema, UHandlerOutput>
     : TRouter[K] extends Router<any>
       ? ORPCHooksWithRouter<TRouter[K]>
       : never
@@ -52,19 +44,19 @@ export interface CreateORPCHooksOptions<
 export function createORPCHooks<TRouter extends ContractRouter | Router<any>>(
   options: CreateORPCHooksOptions<TRouter>,
 ): TRouter extends Router<any>
-  ? ORPCHooksWithRouter<TRouter>
-  : TRouter extends ContractRouter
-    ? ORPCHooksWithContractRouter<TRouter>
-    : never {
+    ? ORPCHooksWithRouter<TRouter>
+    : TRouter extends ContractRouter
+      ? ORPCHooksWithContractRouter<TRouter>
+      : never {
   const path = options.path ?? []
   const generalHooks = createGeneralHooks({ context: options.context, path })
 
   // for sure root is not procedure, so do not it procedure hooks on root
   const procedureHooks = path.length
     ? createProcedureHooks({
-        context: options.context,
-        path,
-      })
+      context: options.context,
+      path,
+    })
     : {}
 
   return new Proxy(

package/src/react-utils.ts

@@ -5,32 +5,21 @@ import type {
   SchemaOutput,
 } from '@orpc/contract'
 import type { Procedure, Router } from '@orpc/server'
-import { type GeneralUtils, createGeneralUtils } from './general-utils'
-import { type ProcedureUtils, createProcedureUtils } from './procedure-utils'
 import type { ORPCContextValue } from './react-context'
+import { createGeneralUtils, type GeneralUtils } from './general-utils'
+import { createProcedureUtils, type ProcedureUtils } from './procedure-utils'
 
 export type ORPCUtilsWithContractRouter<TRouter extends ContractRouter> = {
-  [K in keyof TRouter]: TRouter[K] extends ContractProcedure<
-    infer UInputSchema,
-    infer UOutputSchema
-  >
-    ? ProcedureUtils<UInputSchema, UOutputSchema, SchemaOutput<UOutputSchema>> &
-        GeneralUtils<UInputSchema, UOutputSchema, SchemaOutput<UOutputSchema>>
+  [K in keyof TRouter]: TRouter[K] extends ContractProcedure<infer UInputSchema, infer UOutputSchema>
+    ? ProcedureUtils<UInputSchema, UOutputSchema, SchemaOutput<UOutputSchema>> & GeneralUtils<UInputSchema, UOutputSchema, SchemaOutput<UOutputSchema>>
     : TRouter[K] extends ContractRouter
       ? ORPCUtilsWithContractRouter<TRouter[K]>
       : never
 } & GeneralUtils<undefined, undefined, unknown>
 
 export type ORPCUtilsWithRouter<TRouter extends Router<any>> = {
-  [K in keyof TRouter]: TRouter[K] extends Procedure<
-    any,
-    any,
-    infer UInputSchema,
-    infer UOutputSchema,
-    infer UHandlerOutput
-  >
-    ? ProcedureUtils<UInputSchema, UOutputSchema, UHandlerOutput> &
-        GeneralUtils<UInputSchema, UOutputSchema, UHandlerOutput>
+  [K in keyof TRouter]: TRouter[K] extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UHandlerOutput>
+    ? ProcedureUtils<UInputSchema, UOutputSchema, UHandlerOutput> & GeneralUtils<UInputSchema, UOutputSchema, UHandlerOutput>
     : TRouter[K] extends Router<any>
       ? ORPCUtilsWithRouter<TRouter[K]>
       : never
@@ -52,10 +41,10 @@ export interface CreateORPCUtilsOptions<
 export function createORPCUtils<TRouter extends ContractRouter | Router<any>>(
   options: CreateORPCUtilsOptions<TRouter>,
 ): TRouter extends Router<any>
-  ? ORPCUtilsWithRouter<TRouter>
-  : TRouter extends ContractRouter
-    ? ORPCUtilsWithContractRouter<TRouter>
-    : never {
+    ? ORPCUtilsWithRouter<TRouter>
+    : TRouter extends ContractRouter
+      ? ORPCUtilsWithContractRouter<TRouter>
+      : never {
   const path = options.path ?? []
   const client = options.contextValue.client as any
 
@@ -67,10 +56,10 @@ export function createORPCUtils<TRouter extends ContractRouter | Router<any>>(
   // for sure root is not procedure, so do not it procedure utils on root
   const procedureUtils = path.length
     ? createProcedureUtils({
-        client,
-        queryClient: options.contextValue.queryClient,
-        path,
-      })
+      client,
+      queryClient: options.contextValue.queryClient,
+      path,
+    })
     : {}
 
   return new Proxy(

package/src/react.test-d.ts

@@ -1,16 +1,16 @@
 import type { SchemaOutput } from '@orpc/contract'
 import type { QueryClient } from '@tanstack/react-query'
+import type { GeneralHooks } from './general-hooks'
+import type { GeneralUtils } from './general-utils'
+import type { ProcedureHooks } from './procedure-hooks'
+import type { ProcedureUtils } from './procedure-utils'
 import {
+  orpc,
+  orpcClient,
   ORPCContext,
   type UserFindInputSchema,
   type UserSchema,
-  orpc,
-  orpcClient,
 } from '../tests/orpc'
-import type { GeneralHooks } from './general-hooks'
-import type { GeneralUtils } from './general-utils'
-import type { ProcedureHooks } from './procedure-hooks'
-import type { ProcedureUtils } from './procedure-utils'
 import { useQueriesFactory } from './use-queries/hook'
 
 describe('useUtils', () => {