Accept any CommonCache instance as optional cache option.

benjamn · Nov 17, 2023 · 789bdec · 789bdec
1 parent f57dec5
commit 789bdec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -90,9 +90,6 @@ export type OptimisticWrapperFunction<
 };
 
 export { CommonCache }
-export interface CommonCacheConstructor<TCacheKey, TResult, TArgs extends any[]> {
-  new <K extends TCacheKey, V extends Entry<TArgs, TResult>>(max?: number, dispose?: (value: V, key?: K) => void): CommonCache<K,V>;
-}
 
 export type OptimisticWrapOptions<
   TArgs extends any[],
@@ -113,7 +110,7 @@ export type OptimisticWrapOptions<
   // If provided, the subscribe function should either return an unsubscribe
   // function or return nothing.
   subscribe?: (...args: TArgs) => void | (() => any);
-  Cache?: CommonCacheConstructor<NoInfer<TCacheKey>, NoInfer<TResult>, NoInfer<TArgs>>
+  cache?: CommonCache<NoInfer<TCacheKey>, Entry<NoInfer<TArgs>, NoInfer<TResult>>>;
 };
 
 const caches = new Set<CommonCache<any, AnyEntry>>();
@@ -128,13 +125,11 @@ export function wrap<
   makeCacheKey = (defaultMakeCacheKey as () => TCacheKey),
   keyArgs,
   subscribe,
-  Cache = StrongCache
-}: OptimisticWrapOptions<TArgs, TKeyArgs, TCacheKey, TResult> = Object.create(null)) {
-  const cache = new Cache<TCacheKey, Entry<TArgs, TResult>>(
+  cache = new StrongCache(
     max,
     entry => entry.dispose(),
-  );
-
+  ),
+}: OptimisticWrapOptions<TArgs, TKeyArgs, TCacheKey, TResult> = Object.create(null)) {
   const optimistic = function (): TResult {
     const key = makeCacheKey.apply(
       null,

diff --git a/src/tests/api.ts b/src/tests/api.ts
@@ -38,13 +38,8 @@ describe("optimism", function () {
   });
 
   it("can manually set the `Cache` implementation", () => {
-    let cache!: Cache<any, any>;
-
     class Cache<K, V> implements CommonCache<K, V> {
       private _cache = new Map<K, V>()
-      constructor() {
-        cache = this;
-      }
       has = this._cache.has.bind(this._cache);
       get = this._cache.get.bind(this._cache);
       delete = this._cache.delete.bind(this._cache);
@@ -56,13 +51,15 @@ describe("optimism", function () {
       clean(){};
     }
 
+    const cache = new Cache<String, any>();
+
     const wrapped = wrap(
       (obj: { value: string }) => obj.value + " transformed",
       {
+        cache,
         makeCacheKey(obj) {
           return obj.value;
         },
-        Cache,
       }
     );
     assert.ok(cache instanceof Cache);