refactor: remove notifiable base class

TkDodo · TkDodo · commit 5a1e5069afc0 · 2021-12-11T09:30:13.000+01:00
this abstraction costs more than the simple duplication, and we also have other notify functions which were not unified
diff --git a/src/core/mutationCache.ts b/src/core/mutationCache.ts
@@ -4,7 +4,7 @@ import type { QueryClient } from './queryClient'
 import { notifyManager } from './notifyManager'
 import { Action, Mutation, MutationState } from './mutation'
 import { matchMutation, MutationFilters, noop } from './utils'
-import { Notifiable } from './notifiable'
+import { Subscribable } from './subscribable'
 
 // TYPES
 
@@ -61,9 +61,11 @@ type MutationCacheNotifyEvent =
   | NotifyEventMutationObserverRemoved
   | NotifyEventMutationUpdated
 
+type MutationCacheListener = (event: MutationCacheNotifyEvent) => void
+
 // CLASS
 
-export class MutationCache extends Notifiable<MutationCacheNotifyEvent> {
+export class MutationCache extends Subscribable<MutationCacheListener> {
   config: MutationCacheConfig
 
   private mutations: Mutation<any, any, any, any>[]
@@ -134,6 +136,14 @@ export class MutationCache extends Notifiable<MutationCacheNotifyEvent> {
     return this.mutations.filter(mutation => matchMutation(filters, mutation))
   }
 
+  notify(event: MutationCacheNotifyEvent) {
+    notifyManager.batch(() => {
+      this.listeners.forEach(listener => {
+        listener(event)
+      })
+    })
+  }
+
   onFocus(): void {
     this.resumePausedMutations()
   }
diff --git a/src/core/notifiable.ts b/src/core/notifiable.ts
diff --git a/src/core/queryCache.ts b/src/core/queryCache.ts
@@ -8,7 +8,7 @@ import { Action, Query, QueryState } from './query'
 import type { QueryKey, QueryOptions } from './types'
 import { notifyManager } from './notifyManager'
 import type { QueryClient } from './queryClient'
-import { Notifiable } from './notifiable'
+import { Subscribable } from './subscribable'
 import { QueryObserver } from './queryObserver'
 
 // TYPES
@@ -63,9 +63,11 @@ type QueryCacheNotifyEvent =
   | NotifyEventQueryObserverRemoved
   | NotifyEventQueryObserverResultsUpdated
 
+type QueryCacheListener = (event: QueryCacheNotifyEvent) => void
+
 // CLASS
 
-export class QueryCache extends Notifiable<QueryCacheNotifyEvent> {
+export class QueryCache extends Subscribable<QueryCacheListener> {
   config: QueryCacheConfig
 
   private queries: Query<any, any, any, any>[]
@@ -177,6 +179,14 @@ export class QueryCache extends Notifiable<QueryCacheNotifyEvent> {
       : this.queries
   }
 
+  notify(event: QueryCacheNotifyEvent) {
+    notifyManager.batch(() => {
+      this.listeners.forEach(listener => {
+        listener(event)
+      })
+    })
+  }
+
   onFocus(): void {
     notifyManager.batch(() => {
       this.queries.forEach(query => {
