refactor(app/weakCache): more generic

exuanbo · Dec 7, 2023 · b6f9f57 · b6f9f57
1 parent e4e33f4
commit b6f9f57
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/app/actionObserver.ts b/src/app/actionObserver.ts
@@ -37,7 +37,7 @@ export const createActionObserver = (): ActionObserver => {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const getOrCache = createWeakCache<PayloadActionCreator<any>, Observable<any>>()
+  const getOrCache = createWeakCache<PayloadActionCreator<any>>()
 
   const onAction: OnAction = (actionCreator) =>
     getOrCache(actionCreator, () => action$.pipe(filter(matchType(actionCreator)), map(getPayload)))

diff --git a/src/app/stateObserver.ts b/src/app/stateObserver.ts
@@ -33,8 +33,7 @@ export const createStateObserver = <TState>(): StateObserver<TState> => {
     }
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const getOrCache = createWeakCache<Selector<TState, unknown>, Observable<any>>()
+  const getOrCache = createWeakCache<Selector<TState, unknown>>()
 
   const onState: OnState<TState> = (selector) =>
     getOrCache(selector, () => distinctState$.pipe(map(selector), distinctUntilChanged()))

diff --git a/src/app/weakCache.ts b/src/app/weakCache.ts
@@ -1,7 +1,8 @@
-type WeakCache<K extends WeakKey, V> = (key: K, createValue: () => V) => V
+type WeakCache<K extends WeakKey> = <V>(key: K, createValue: () => V) => V
 
-export const createWeakCache = <K extends WeakKey, V>(): WeakCache<K, V> => {
-  const cache = new WeakMap<K, V>()
+export const createWeakCache = <K extends WeakKey>(): WeakCache<K> => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const cache = new WeakMap<K, any>()
 
   return (key, createValue) => {
     let value = cache.get(key)