fix(angular-query): add notifyManager to query and mutation (#6633)

Author: arnoud-dv

packages/angular-query-experimental/src/__tests__/inject-mutation.test.ts

@@ -37,6 +37,7 @@ describe('injectMutation', () => {
       })
 
       mutation.mutate()
+      vi.advanceTimersByTime(1)
       expect(mutation.status()).toBe('pending')
     })
   })
@@ -56,7 +57,7 @@ describe('injectMutation', () => {
     })
   })
 
-  test('should change state after invoking mutate', () => {
+  test('should change state after invoking mutate', async () => {
     const result = 'Mock data'
 
     const mutation = TestBed.runInInjectionContext(() => {
@@ -66,6 +67,7 @@ describe('injectMutation', () => {
     })
 
     mutation.mutate(result)
+    vi.advanceTimersByTime(1)
 
     expectSignals(mutation, {
       isIdle: false,
@@ -159,6 +161,8 @@ describe('injectMutation', () => {
 
     mutation.reset()
 
+    await resolveMutations()
+
     expectSignals(mutation, {
       isIdle: true,
       isPending: false,

packages/angular-query-experimental/src/__tests__/test-utils.ts

@@ -1,5 +1,4 @@
-import { untracked } from '@angular/core'
-import { isReactive } from '@angular/core/primitives/signals'
+import { isSignal, untracked } from '@angular/core'
 
 export function simpleFetcher(): Promise<string> {
   return new Promise((resolve) => {
@@ -54,7 +53,7 @@ function evaluateSignals<T extends Record<string, any>>(
       if (
         Object.prototype.hasOwnProperty.call(obj, key) &&
         // Only evaluate signals, not normal functions
-        isReactive(obj[key])
+        isSignal(obj[key])
       ) {
         const func = obj[key]
         result[key] = func()

packages/angular-query-experimental/src/create-base-query.ts

@@ -6,6 +6,7 @@ import {
   inject,
   signal,
 } from '@angular/core'
+import { notifyManager } from '@tanstack/query-core'
 import { signalProxy } from './signal-proxy'
 import type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core'
 import type { CreateBaseQueryOptions, CreateBaseQueryResult } from './types'
@@ -78,7 +79,9 @@ export function createBaseQuery<
   )
 
   // observer.trackResult is not used as this optimization is not needed for Angular
-  const unsubscribe = observer.subscribe(resultSignal.set)
+  const unsubscribe = observer.subscribe(
+    notifyManager.batchCalls((val) => resultSignal.set(val)),
+  )
   destroyRef.onDestroy(unsubscribe)
 
   return signalProxy(resultSignal)

packages/angular-query-experimental/src/inject-mutation.ts

@@ -1,5 +1,5 @@
 import { DestroyRef, computed, effect, inject, signal } from '@angular/core'
-import { MutationObserver } from '@tanstack/query-core'
+import { MutationObserver, notifyManager } from '@tanstack/query-core'
 import { assertInjector } from './util/assert-injector/assert-injector'
 import { signalProxy } from './signal-proxy'
 import { injectQueryClient } from './inject-query-client'
@@ -44,7 +44,9 @@ export function injectMutation<
 
     const result = signal(observer.getCurrentResult())
 
-    const unsubscribe = observer.subscribe(result.set)
+    const unsubscribe = observer.subscribe(
+      notifyManager.batchCalls((val) => result.set(val)),
+    )
 
     destroyRef.onDestroy(unsubscribe)