@tanstack/query-core 4.21.0 → 4.22.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/query-core",
-  "version": "4.21.0",
+  "version": "4.22.4",
   "description": "The framework agnostic core that powers TanStack Query",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -28,9 +28,12 @@
     "src"
   ],
   "scripts": {
-    "clean": "rm -rf ./build",
-    "test:eslint": "../../node_modules/.bin/eslint --ext .ts,.tsx ./src",
-    "test:jest": "../../node_modules/.bin/jest --config ./jest.config.ts",
-    "test:dev": "pnpm run test:jest --watch"
+    "clean": "rimraf ./build",
+    "test:eslint": "eslint --ext .ts,.tsx ./src",
+    "test:types": "tsc",
+    "test:lib": "jest --config ./jest.config.ts",
+    "test:lib:dev": "pnpm run test:lib --watch",
+    "test:lib:publish": "pnpm run test:lib --collectCoverage false",
+    "build:types": "tsc --build"
   }
 }

package/src/hydration.ts

@@ -65,11 +65,11 @@ function dehydrateQuery(query: Query): DehydratedQuery {
   }
 }
 
-function defaultShouldDehydrateMutation(mutation: Mutation) {
+export function defaultShouldDehydrateMutation(mutation: Mutation) {
   return mutation.state.isPaused
 }
 
-function defaultShouldDehydrateQuery(query: Query) {
+export function defaultShouldDehydrateQuery(query: Query) {
   return query.state.status === 'success'
 }
 

package/src/index.ts

@@ -23,7 +23,12 @@ export {
 } from './utils'
 export type { MutationFilters, QueryFilters, Updater } from './utils'
 export { isCancelledError } from './retryer'
-export { dehydrate, hydrate } from './hydration'
+export {
+  dehydrate,
+  hydrate,
+  defaultShouldDehydrateMutation,
+  defaultShouldDehydrateQuery,
+} from './hydration'
 
 // Types
 export * from './types'

package/src/mutationObserver.ts

@@ -166,7 +166,7 @@ export class MutationObserver<
   private notify(options: NotifyOptions) {
     notifyManager.batch(() => {
       // First trigger the mutate callbacks
-      if (this.mutateOptions) {
+      if (this.mutateOptions && this.hasListeners()) {
         if (options.onSuccess) {
           this.mutateOptions.onSuccess?.(
             this.currentResult.data!,

package/src/tests/mutations.test.tsx

@@ -308,49 +308,24 @@ describe('mutations', () => {
     expect(onSettled).toHaveBeenCalled()
   })
 
-  test('setState should update the mutation state', async () => {
-    const mutation = new MutationObserver(queryClient, {
-      mutationFn: async () => {
-        return 'update'
-      },
-      onMutate: (text) => text,
-    })
-    await mutation.mutate()
-    expect(mutation.getCurrentResult().data).toEqual('update')
-
-    // Force setState usage
-    // because no use case has been found using mutation.setState
-    const currentMutation = mutation['currentMutation']
-    currentMutation?.setState({
-      context: undefined,
-      variables: undefined,
-      data: 'new',
-      error: undefined,
-      failureCount: 0,
-      failureReason: null,
-      isPaused: false,
-      status: 'success',
-    })
+  test('addObserver should not add an existing observer', async () => {
+    const mutationCache = queryClient.getMutationCache()
+    const observer = new MutationObserver(queryClient, {})
+    const currentMutation = mutationCache.build(queryClient, {})
 
-    expect(mutation.getCurrentResult().data).toEqual('new')
-  })
+    const fn = jest.fn()
 
-  test('addObserver should not add an existing observer', async () => {
-    const mutation = new MutationObserver(queryClient, {
-      mutationFn: async () => {
-        return 'update'
-      },
-      onMutate: (text) => text,
+    const unsubscribe = mutationCache.subscribe((event) => {
+      fn(event.type)
     })
-    await mutation.mutate()
 
-    // Force addObserver usage to add an existing observer
-    // because no use case has been found
-    const currentMutation = mutation['currentMutation']!
-    expect(currentMutation['observers'].length).toEqual(1)
-    currentMutation.addObserver(mutation)
+    currentMutation.addObserver(observer)
+    currentMutation.addObserver(observer)
 
-    expect(currentMutation['observers'].length).toEqual(1)
+    expect(fn).toHaveBeenCalledTimes(1)
+    expect(fn).toHaveBeenCalledWith('observerAdded')
+
+    unsubscribe()
   })
 
   test('mutate should throw an error if no mutationFn found', async () => {
@@ -367,4 +342,20 @@ describe('mutations', () => {
     }
     expect(error).toEqual('No mutationFn found')
   })
+
+  test('mutate update the mutation state even without an active subscription', async () => {
+    const onSuccess = jest.fn()
+    const onSettled = jest.fn()
+
+    const mutation = new MutationObserver(queryClient, {
+      mutationFn: async () => {
+        return 'update'
+      },
+    })
+
+    await mutation.mutate(undefined, { onSuccess, onSettled })
+    expect(mutation.getCurrentResult().data).toEqual('update')
+    expect(onSuccess).not.toHaveBeenCalled()
+    expect(onSettled).not.toHaveBeenCalled()
+  })
 })