feat: reorganize

src/lib/queries/client/createClient.ts

@@ -37,7 +37,7 @@ import { createCacheClient } from "./cache/cacheClient"
 import { Logger } from "../../logger"
 import { markQueryAsStaleIfRefetch } from "./refetch/markQueryAsStaleIfRefetch"
 import { dispatchExternalRefetchToAllQueries } from "./refetch/dispatchExternalRefetchToAllQueries"
-import { MutationClient } from "./mutations/MutationClient"
+import { MutationRunners } from "./mutations/runners/MutationRunners"
 import { type MutationOptions } from "./mutations/types"
 import { MutationCache } from "./mutations/cache/MutationCache"
 import { MutationObserver } from "./mutations/observers/MutationObserver"
@@ -206,7 +206,7 @@ export const createClient = ({ client }: { client: QueryClient }) => {
 export class QueryClient {
   public client: ReturnType<typeof createClient>
   protected mutationCache: MutationCache
-  mutationClient: MutationClient
+  protected mutationRunners: MutationRunners
   public mutationObserver: MutationObserver
 
   constructor(
@@ -215,7 +215,7 @@ export class QueryClient {
     }
   ) {
     this.mutationCache = mutationCache
-    this.mutationClient = new MutationClient(this)
+    this.mutationRunners = new MutationRunners(this)
     this.mutationObserver = new MutationObserver(this)
 
     this.client = createClient({
@@ -227,7 +227,7 @@ export class QueryClient {
     const stop = this.client.start()
 
     return () => {
-      this.mutationClient.destroy()
+      this.mutationRunners.destroy()
       stop()
     }
   }

src/lib/queries/client/mutations/observers/MutationObserver.ts

@@ -137,7 +137,7 @@ export class MutationObserver<
       ...options
     }
 
-    const mutation = this.client.mutationClient.mutate<
+    const mutation = this.client.mutationRunners.mutate<
       TData,
       TVariables
     >({

src/lib/queries/client/mutations/MutationClient.ts → src/lib/queries/client/mutations/runners/MutationRunners.ts

@@ -6,14 +6,14 @@ import {
   distinctUntilChanged,
   take
 } from "rxjs"
-import { serializeKey } from "../keys/serializeKey"
-import { type MutationOptions } from "./types"
-import { createMutationRunner } from "./runner/createMutationRunner"
-import { shallowEqual } from "../../../utils/shallowEqual"
-import { type QueryClient } from "../createClient"
-import { type DefaultError } from "../types"
-
-export class MutationClient {
+import { serializeKey } from "../../keys/serializeKey"
+import { type MutationOptions } from "../types"
+import { createMutationRunner } from "./MutationRunner"
+import { shallowEqual } from "../../../../utils/shallowEqual"
+import { type QueryClient } from "../../createClient"
+import { type DefaultError } from "../../types"
+
+export class MutationRunners {
   /**
    * Contain all active mutation for a given key.
    * A mutation ca have several triggers running (it is not necessarily one function running)

src/lib/queries/react/mutations/useMutation.test.tsx

@@ -300,7 +300,7 @@ describe("useMutation", () => {
 
         unmount()
 
-        const resultForKey = client.mutationClient.mutationRunnersByKey$
+        const resultForKey = client.mutationRunners.mutationRunnersByKey$
           .getValue()
           .get(serializeKey(["foo"]))
 

src/lib/queries/react/mutations/useMutation.ts

@@ -37,7 +37,7 @@ export function useMutation<Args = void, R = undefined>(
   )
   const mutationsToCancel = useRef<
     Array<
-      ReturnType<typeof finalQueryClient.mutationClient.mutate<any, any, any>>
+      ReturnType<typeof finalQueryClient.mutationRunners.mutate<any, any, any>>
     >
   >([])
 
@@ -46,7 +46,7 @@ export function useMutation<Args = void, R = undefined>(
 
   const mutate = useCallback(
     (mutationArgs: Args) => {
-      const mutation = finalQueryClient.mutationClient.mutate({
+      const mutation = finalQueryClient.mutationRunners.mutate({
         options: {
           ...optionsRef.current,
           mutationKey: optionsRef.current.mutationKey ?? defaultKey.current