fix: revert CACHE_DROP to .dropCache()

Author: kirillgroshkov

src/decorators/asyncMemo.decorator.test.ts

@@ -1,5 +1,4 @@
 import { _AsyncMemo } from './asyncMemo.decorator'
-import { CACHE_DROP } from './memo.decorator'
 import { MapMemoCache } from './memo.util'
 
 class A {
@@ -37,7 +36,7 @@ test('memo a', async () => {
   expect(a.func).toMatchSnapshot()
 
   // cleanup for the next tests
-  await (a.a as any)(CACHE_DROP)
+  await (a.a as any).dropCache()
 })
 
 test('MEMO_DROP_CACHE', async () => {
@@ -48,7 +47,7 @@ test('MEMO_DROP_CACHE', async () => {
   await a.a(2, 3)
 
   // drop cache
-  await (a.a as any)(CACHE_DROP)
+  await (a.a as any).dropCache()
 
   // second call
   await a.a(2, 3)

src/decorators/asyncMemo.decorator.ts

@@ -2,7 +2,7 @@ import { _since } from '../time/time.util'
 import { Merge } from '../typeFest'
 import { AnyObject } from '../types'
 import { _getArgsSignature, _getMethodSignature, _getTargetMethodSignature } from './decorator.util'
-import { CACHE_DROP, MemoOptions } from './memo.decorator'
+import { MemoOptions } from './memo.decorator'
 import { AsyncMemoCache, jsonMemoSerializer } from './memo.util'
 
 export type AsyncMemoOptions = Merge<
@@ -65,19 +65,6 @@ export const _AsyncMemo =
         // UPD: no! AsyncMemo supports "persistent caches" (e.g Database-backed cache)
       }
 
-      if (args.length === 1 && args[0] === CACHE_DROP) {
-        // Special event - CACHE_DROP
-        // Function will return undefined
-        logger.log(`${methodSignature} @_AsyncMemo.dropCache()`)
-        try {
-          await Promise.all(cache.get(ctx)!.map(c => c.clear()))
-        } catch (err) {
-          logger.error(err)
-        }
-
-        return
-      }
-
       let value: any
 
       try {
@@ -146,6 +133,15 @@ export const _AsyncMemo =
         }
       }
     } as any
+    ;(descriptor.value as any).dropCache = async () => {
+      logger.log(`${methodSignature} @_AsyncMemo.dropCache()`)
+      try {
+        await Promise.all([...cache.values()].flatMap(c => c.map(c => c.clear())))
+        cache.clear()
+      } catch (err) {
+        logger.error(err)
+      }
+    }
 
     return descriptor
   }

src/decorators/memo.decorator.test.ts

@@ -1,4 +1,4 @@
-import { _Memo, CACHE_DROP } from './memo.decorator'
+import { _Memo } from './memo.decorator'
 
 class A {
   func(n: number): void {
@@ -33,7 +33,7 @@ test('memo a', () => {
   expect(a.func).toMatchSnapshot()
 
   // cleanup for the next tests
-  ;(a.a as any)(CACHE_DROP)
+  ;(a.a as any).dropCache()
 })
 
 test('MEMO_DROP_CACHE', () => {
@@ -44,7 +44,7 @@ test('MEMO_DROP_CACHE', () => {
   a.a(2, 3)
 
   // drop cache
-  ;(a.a as any)(CACHE_DROP)
+  ;(a.a as any).dropCache()
 
   // second call
   a.a(2, 3)

src/decorators/memo.decorator.ts

@@ -10,11 +10,6 @@ import { AnyObject } from '../types'
 import { _getArgsSignature, _getMethodSignature, _getTargetMethodSignature } from './decorator.util'
 import { jsonMemoSerializer, MapMemoCache, MemoCache } from './memo.util'
 
-/**
- * Symbol to indicate that the Cache should be dropped.
- */
-export const CACHE_DROP = Symbol('CACHE_DROP')
-
 export interface MemoOptions {
   /**
    * Default to false
@@ -111,13 +106,6 @@ export const _Memo =
     descriptor.value = function (this: typeof target, ...args: any[]): any {
       const ctx = this
 
-      if (args.length === 1 && args[0] === CACHE_DROP) {
-        // Special event - CACHE_DROP
-        // Function will return undefined
-        logger.log(`${methodSignature} @_Memo.CACHE_DROP`)
-        return cache.get(ctx)?.clear()
-      }
-
       const cacheKey = cacheKeyFn(args)
 
       if (!cache.has(ctx)) {
@@ -195,6 +183,11 @@ export const _Memo =
         return res
       }
     } as any
+    ;(descriptor.value as any).dropCache = () => {
+      logger.log(`${methodSignature} @_Memo.dropCache()`)
+      cache.forEach(memoCache => memoCache.clear())
+      cache.clear()
+    }
 
     return descriptor
   }

src/decorators/memoPromise.decorator.test.ts

@@ -1,4 +1,4 @@
-import { _Memo, CACHE_DROP } from './memo.decorator'
+import { _Memo } from './memo.decorator'
 
 class A {
   counter = 0
@@ -53,7 +53,7 @@ test('memo a', async () => {
   expect(a.func).toMatchSnapshot()
 
   // cleanup for the next tests
-  ;(a.a as any)(CACHE_DROP)
+  ;(a.a as any).dropCache()
 })
 
 test('MEMO_DROP_CACHE', async () => {
@@ -64,7 +64,7 @@ test('MEMO_DROP_CACHE', async () => {
   await a.a(2, 3)
 
   // drop cache
-  ;(a.a as any)(CACHE_DROP)
+  ;(a.a as any).dropCache()
 
   // second call
   await a.a(2, 3)
@@ -92,5 +92,5 @@ test('memo b', async () => {
   expect(a.func).toHaveBeenCalledTimes(1)
 
   // cleanup for the next tests
-  ;(a.b as any)(CACHE_DROP)
+  ;(a.b as any).dropCache()
 })