refactor: use a set for tracked props

src/core/queryObserver.ts

@@ -72,7 +72,7 @@ export class QueryObserver<
   private staleTimeoutId?: number
   private refetchIntervalId?: number
   private currentRefetchInterval?: number | false
-  private trackedProps!: Array<keyof QueryObserverResult>
+  private trackedProps!: Set<keyof QueryObserverResult>
 
   constructor(
     client: QueryClient,
@@ -88,7 +88,7 @@ export class QueryObserver<
 
     this.client = client
     this.options = options
-    this.trackedProps = []
+    this.trackedProps = new Set()
     this.previousSelectError = null
     this.bindMethods()
     this.setOptions(options)
@@ -235,25 +235,19 @@ export class QueryObserver<
   ): QueryObserverResult<TData, TError> {
     const trackedResult = {} as QueryObserverResult<TData, TError>
 
-    const trackProp = (key: keyof QueryObserverResult) => {
-      if (!this.trackedProps.includes(key)) {
-        this.trackedProps.push(key)
-      }
-    }
-
     Object.keys(result).forEach(key => {
       Object.defineProperty(trackedResult, key, {
         configurable: false,
         enumerable: true,
         get: () => {
-          trackProp(key as keyof QueryObserverResult)
+          this.trackedProps.add(key as keyof QueryObserverResult)
           return result[key as keyof QueryObserverResult]
         },
       })
     })
 
     if (defaultedOptions.useErrorBoundary) {
-      trackProp('error')
+      this.trackedProps.add('error')
     }
 
     return trackedResult
@@ -605,18 +599,17 @@ export class QueryObserver<
 
     if (
       notifyOnChangeProps === 'all' ||
-      (!notifyOnChangeProps && !this.trackedProps.length)
+      (!notifyOnChangeProps && !this.trackedProps.size)
     ) {
       return true
     }
 
-    const includedProps = notifyOnChangeProps ?? this.trackedProps
+    const includedProps = new Set(notifyOnChangeProps ?? this.trackedProps)
 
     return Object.keys(result).some(key => {
       const typedKey = key as keyof QueryObserverResult
       const changed = result[typedKey] !== prevResult[typedKey]
-      const isIncluded = includedProps?.some(x => x === key)
-      return changed && (!includedProps || isIncluded)
+      return changed && includedProps.has(typedKey)
     })
   }
 

src/core/subscribable.ts

@@ -7,15 +7,13 @@ export class Subscribable<TListener extends Function = Listener> {
     this.listeners = []
   }
 
-  subscribe(listener?: TListener): () => void {
-    const callback = listener || (() => undefined)
-
-    this.listeners.push(callback as TListener)
+  subscribe(listener: TListener): () => void {
+    this.listeners.push(listener as TListener)
 
     this.onSubscribe()
 
     return () => {
-      this.listeners = this.listeners.filter(x => x !== callback)
+      this.listeners = this.listeners.filter(x => x !== listener)
       this.onUnsubscribe()
     }
   }

src/core/tests/focusManager.test.tsx

@@ -69,7 +69,7 @@ describe('focusManager', () => {
 
     const setEventListenerSpy = jest.spyOn(focusManager, 'setEventListener')
 
-    const unsubscribe = focusManager.subscribe()
+    const unsubscribe = focusManager.subscribe(() => undefined)
     expect(setEventListenerSpy).toHaveBeenCalledTimes(0)
 
     unsubscribe()
@@ -88,7 +88,7 @@ describe('focusManager', () => {
     )
 
     // Should set the default event listener with window event listeners
-    const unsubscribe = focusManager.subscribe()
+    const unsubscribe = focusManager.subscribe(() => undefined)
     expect(addEventListenerSpy).toHaveBeenCalledTimes(2)
 
     // Should replace the window default event listener by a new one

src/core/tests/mutationCache.test.tsx

@@ -164,7 +164,7 @@ describe('mutationCache', () => {
         cacheTime: 10,
         mutationFn: () => Promise.resolve(),
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
 
       expect(queryClient.getMutationCache().getAll()).toHaveLength(0)
       observer.mutate(1)
@@ -231,7 +231,7 @@ describe('mutationCache', () => {
         },
         onSuccess,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       observer.mutate(1)
       unsubscribe()
       expect(queryClient.getMutationCache().getAll()).toHaveLength(1)
@@ -257,7 +257,7 @@ describe('mutationCache', () => {
         },
         onSuccess,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       observer.mutate(1)
       unsubscribe()
       await waitFor(() => {

src/core/tests/onlineManager.test.tsx

@@ -64,7 +64,7 @@ describe('onlineManager', () => {
 
     const setEventListenerSpy = jest.spyOn(onlineManager, 'setEventListener')
 
-    const unsubscribe = onlineManager.subscribe()
+    const unsubscribe = onlineManager.subscribe(() => undefined)
     expect(setEventListenerSpy).toHaveBeenCalledTimes(0)
 
     unsubscribe()
@@ -83,7 +83,7 @@ describe('onlineManager', () => {
     )
 
     // Should set the default event listener with window event listeners
-    const unsubscribe = onlineManager.subscribe()
+    const unsubscribe = onlineManager.subscribe(() => undefined)
     expect(addEventListenerSpy).toHaveBeenCalledTimes(2)
 
     // Should replace the window default event listener by a new one

src/core/tests/queriesObserver.test.tsx

@@ -248,7 +248,7 @@ describe('queriesObserver', () => {
       { queryKey: key1, queryFn: queryFn1 },
       { queryKey: key2, queryFn: queryFn2 },
     ])
-    const unsubscribe = observer.subscribe()
+    const unsubscribe = observer.subscribe(() => undefined)
     await sleep(1)
     unsubscribe()
     expect(queryFn1).toHaveBeenCalledTimes(1)

src/core/tests/query.test.tsx

@@ -224,7 +224,7 @@ describe('query', () => {
       queryKey: key,
       enabled: false,
     })
-    const unsubscribe = observer.subscribe()
+    const unsubscribe = observer.subscribe(() => undefined)
     unsubscribe()
 
     await sleep(100)
@@ -253,7 +253,7 @@ describe('query', () => {
       queryKey: key,
       enabled: false,
     })
-    const unsubscribe = observer.subscribe()
+    const unsubscribe = observer.subscribe(() => undefined)
     unsubscribe()
 
     await sleep(100)
@@ -484,10 +484,10 @@ describe('query', () => {
       cacheTime: 0,
       staleTime: Infinity,
     })
-    const unsubscribe1 = observer.subscribe()
+    const unsubscribe1 = observer.subscribe(() => undefined)
     unsubscribe1()
     await waitFor(() => expect(queryCache.find(key)).toBeUndefined())
-    const unsubscribe2 = observer.subscribe()
+    const unsubscribe2 = observer.subscribe(() => undefined)
     unsubscribe2()
 
     await waitFor(() => expect(queryCache.find(key)).toBeUndefined())
@@ -502,7 +502,7 @@ describe('query', () => {
       cacheTime: 0,
     })
     expect(queryCache.find(key)).toBeDefined()
-    const unsubscribe = observer.subscribe()
+    const unsubscribe = observer.subscribe(() => undefined)
     expect(queryCache.find(key)).toBeDefined()
     unsubscribe()
     await waitFor(() => expect(queryCache.find(key)).toBeUndefined())
@@ -518,7 +518,7 @@ describe('query', () => {
       },
       cacheTime: 10,
     })
-    const unsubscribe = observer.subscribe()
+    const unsubscribe = observer.subscribe(() => undefined)
     await sleep(20)
     expect(queryCache.find(key)).toBeDefined()
     observer.refetch()
@@ -539,7 +539,7 @@ describe('query', () => {
       cacheTime: 0,
     })
     expect(queryCache.find(key)).toBeDefined()
-    const unsubscribe = observer.subscribe()
+    const unsubscribe = observer.subscribe(() => undefined)
     await sleep(100)
     expect(queryCache.find(key)).toBeDefined()
     unsubscribe()
@@ -560,9 +560,9 @@ describe('query', () => {
 
     expect(query?.getObserversCount()).toEqual(0)
 
-    const unsubscribe1 = observer.subscribe()
-    const unsubscribe2 = observer2.subscribe()
-    const unsubscribe3 = observer3.subscribe()
+    const unsubscribe1 = observer.subscribe(() => undefined)
+    const unsubscribe2 = observer2.subscribe(() => undefined)
+    const unsubscribe3 = observer3.subscribe(() => undefined)
     expect(query?.getObserversCount()).toEqual(3)
 
     unsubscribe3()
@@ -658,7 +658,7 @@ describe('query', () => {
     })
 
     const refetchSpy = jest.spyOn(observer, 'refetch')
-    const unsubscribe = observer.subscribe()
+    const unsubscribe = observer.subscribe(() => undefined)
     queryCache.onOnline()
 
     // Should refetch the observer
@@ -821,7 +821,7 @@ describe('query', () => {
       retry: false,
     })
 
-    const unsubscribe = observer.subscribe()
+    const unsubscribe = observer.subscribe(() => undefined)
     await sleep(10)
     expect(consoleMock).toHaveBeenCalledWith('Missing queryFn')
 

src/core/tests/queryClient.test.tsx

@@ -722,8 +722,8 @@ describe('queryClient', () => {
         queryKey: key1,
         enabled: false,
       })
-      observer1.subscribe()
-      observer2.subscribe()
+      observer1.subscribe(() => undefined)
+      observer2.subscribe(() => undefined)
       await queryClient.refetchQueries()
       observer1.destroy()
       observer2.destroy()
@@ -743,7 +743,7 @@ describe('queryClient', () => {
         queryFn: queryFn1,
         staleTime: Infinity,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       await queryClient.refetchQueries({ type: 'active', stale: false })
       unsubscribe()
       expect(queryFn1).toHaveBeenCalledTimes(2)
@@ -761,7 +761,7 @@ describe('queryClient', () => {
         queryKey: key1,
         queryFn: queryFn1,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       queryClient.invalidateQueries(key1)
       await queryClient.refetchQueries({ stale: true })
       unsubscribe()
@@ -782,7 +782,7 @@ describe('queryClient', () => {
         queryKey: key1,
         queryFn: queryFn1,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       await queryClient.refetchQueries(
         { type: 'active', stale: true },
         { cancelRefetch: false }
@@ -804,7 +804,7 @@ describe('queryClient', () => {
         queryFn: queryFn1,
         staleTime: Infinity,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       await queryClient.refetchQueries()
       unsubscribe()
       expect(queryFn1).toHaveBeenCalledTimes(2)
@@ -823,7 +823,7 @@ describe('queryClient', () => {
         queryFn: queryFn1,
         staleTime: Infinity,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       await queryClient.refetchQueries({ type: 'all' })
       unsubscribe()
       expect(queryFn1).toHaveBeenCalledTimes(2)
@@ -842,7 +842,7 @@ describe('queryClient', () => {
         queryFn: queryFn1,
         staleTime: Infinity,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       await queryClient.refetchQueries({ type: 'active' })
       unsubscribe()
       expect(queryFn1).toHaveBeenCalledTimes(2)
@@ -861,7 +861,7 @@ describe('queryClient', () => {
         queryFn: queryFn1,
         staleTime: Infinity,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       await queryClient.refetchQueries({ type: 'inactive' })
       unsubscribe()
       expect(queryFn1).toHaveBeenCalledTimes(1)
@@ -906,7 +906,7 @@ describe('queryClient', () => {
         queryFn: queryFn1,
         staleTime: Infinity,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       queryClient.invalidateQueries(key1)
       unsubscribe()
       expect(queryFn1).toHaveBeenCalledTimes(2)
@@ -925,7 +925,7 @@ describe('queryClient', () => {
         enabled: false,
         staleTime: Infinity,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       queryClient.invalidateQueries(key1)
       unsubscribe()
       expect(queryFn1).toHaveBeenCalledTimes(1)
@@ -944,7 +944,7 @@ describe('queryClient', () => {
         queryFn: queryFn1,
         staleTime: Infinity,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       queryClient.invalidateQueries(key1, {
         refetchType: 'none',
       })
@@ -966,7 +966,7 @@ describe('queryClient', () => {
         staleTime: Infinity,
         enabled: false,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       queryClient.invalidateQueries(key1, {
         refetchType: 'inactive',
       })
@@ -987,7 +987,7 @@ describe('queryClient', () => {
         queryFn: queryFn1,
         staleTime: Infinity,
       })
-      const unsubscribe = observer.subscribe()
+      const unsubscribe = observer.subscribe(() => undefined)
       queryClient.invalidateQueries({
         refetchType: 'all',
       })
@@ -1005,7 +1005,7 @@ describe('queryClient', () => {
         enabled: false,
         initialData: 1,
       })
-      observer.subscribe()
+      observer.subscribe(() => undefined)
 
       queryClient.fetchQuery(key, ({ signal }) => {
         const promise = new Promise(resolve => {
@@ -1036,7 +1036,7 @@ describe('queryClient', () => {
         enabled: false,
         initialData: 1,
       })
-      observer.subscribe()
+      observer.subscribe(() => undefined)
 
       queryClient.fetchQuery(key, ({ signal }) => {
         const promise = new Promise(resolve => {
@@ -1125,8 +1125,8 @@ describe('queryClient', () => {
         queryFn: queryFn2,
         enabled: false,
       })
-      observer1.subscribe()
-      observer2.subscribe()
+      observer1.subscribe(() => undefined)
+      observer2.subscribe(() => undefined)
       await queryClient.resetQueries()
       observer2.destroy()
       observer1.destroy()