@naturalcycles/js-lib 14.84.1 → 14.84.2

package/dist/decorators/asyncMemo.decorator.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports._AsyncMemo = void 0;
 const time_util_1 = require("../time/time.util");
 const decorator_util_1 = require("./decorator.util");
-const memo_decorator_1 = require("./memo.decorator");
 const memo_util_1 = require("./memo.util");
 /**
  * Like @_Memo, but allowing async MemoCache implementation.
@@ -30,18 +29,6 @@ const _AsyncMemo = (opt) => (target, key, descriptor) => {
             // here, no need to check the cache. It's definitely a miss, because the cacheLayers is just created
             // UPD: no! AsyncMemo supports "persistent caches" (e.g Database-backed cache)
         }
-        if (args.length === 1 && args[0] === memo_decorator_1.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;
         try {
             for await (const cacheLayer of cache.get(ctx)) {
@@ -91,6 +78,16 @@ const _AsyncMemo = (opt) => (target, key, descriptor) => {
             }
         }
     };
+    descriptor.value.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;
 };
 exports._AsyncMemo = _AsyncMemo;

package/dist/decorators/memo.decorator.d.ts

@@ -1,9 +1,5 @@
 import { CommonLogger } from '../log/commonLogger';
 import { MemoCache } from './memo.util';
-/**
- * Symbol to indicate that the Cache should be dropped.
- */
-export declare const CACHE_DROP: unique symbol;
 export interface MemoOptions {
     /**
      * Default to false

package/dist/decorators/memo.decorator.js

@@ -5,14 +5,10 @@
 // http://inlehmansterms.net/2015/03/01/javascript-memoization/
 // https://community.risingstack.com/the-worlds-fastest-javascript-memoization-library/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._Memo = exports.CACHE_DROP = void 0;
+exports._Memo = void 0;
 const time_util_1 = require("../time/time.util");
 const decorator_util_1 = require("./decorator.util");
 const memo_util_1 = require("./memo.util");
-/**
- * Symbol to indicate that the Cache should be dropped.
- */
-exports.CACHE_DROP = Symbol('CACHE_DROP');
 /**
  * Memoizes the method of the class, so it caches the output and returns the cached version if the "key"
  * of the cache is the same. Key, by defaul, is calculated as `JSON.stringify(...args)`.
@@ -43,12 +39,6 @@ const _Memo = (opt = {}) => (target, key, descriptor) => {
     const methodSignature = (0, decorator_util_1._getTargetMethodSignature)(target, keyStr);
     descriptor.value = function (...args) {
         const ctx = this;
-        if (args.length === 1 && args[0] === exports.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)) {
             cache.set(ctx, cacheFactory());
@@ -101,6 +91,11 @@ const _Memo = (opt = {}) => (target, key, descriptor) => {
             return res;
         }
     };
+    descriptor.value.dropCache = () => {
+        logger.log(`${methodSignature} @_Memo.dropCache()`);
+        cache.forEach(memoCache => memoCache.clear());
+        cache.clear();
+    };
     return descriptor;
 };
 exports._Memo = _Memo;

package/dist-esm/decorators/asyncMemo.decorator.js

@@ -1,7 +1,6 @@
 import { __asyncValues } from "tslib";
 import { _since } from '../time/time.util';
 import { _getArgsSignature, _getMethodSignature, _getTargetMethodSignature } from './decorator.util';
-import { CACHE_DROP } from './memo.decorator';
 import { jsonMemoSerializer } from './memo.util';
 /**
  * Like @_Memo, but allowing async MemoCache implementation.
@@ -29,18 +28,6 @@ export const _AsyncMemo = (opt) => (target, key, descriptor) => {
             // here, no need to check the cache. It's definitely a miss, because the cacheLayers is just created
             // 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;
         try {
             try {
@@ -100,5 +87,15 @@ export const _AsyncMemo = (opt) => (target, key, descriptor) => {
             }
         }
     };
+    descriptor.value.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;
 };

package/dist-esm/decorators/memo.decorator.js

@@ -6,10 +6,6 @@
 import { _since } from '../time/time.util';
 import { _getArgsSignature, _getMethodSignature, _getTargetMethodSignature } from './decorator.util';
 import { jsonMemoSerializer, MapMemoCache } from './memo.util';
-/**
- * Symbol to indicate that the Cache should be dropped.
- */
-export const CACHE_DROP = Symbol('CACHE_DROP');
 /**
  * Memoizes the method of the class, so it caches the output and returns the cached version if the "key"
  * of the cache is the same. Key, by defaul, is calculated as `JSON.stringify(...args)`.
@@ -39,14 +35,7 @@ export const _Memo = (opt = {}) => (target, key, descriptor) => {
     const keyStr = String(key);
     const methodSignature = _getTargetMethodSignature(target, keyStr);
     descriptor.value = function (...args) {
-        var _a;
         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 (_a = cache.get(ctx)) === null || _a === void 0 ? void 0 : _a.clear();
-        }
         const cacheKey = cacheKeyFn(args);
         if (!cache.has(ctx)) {
             cache.set(ctx, cacheFactory());
@@ -99,5 +88,10 @@ export const _Memo = (opt = {}) => (target, key, descriptor) => {
             return res;
         }
     };
+    descriptor.value.dropCache = () => {
+        logger.log(`${methodSignature} @_Memo.dropCache()`);
+        cache.forEach(memoCache => memoCache.clear());
+        cache.clear();
+    };
     return descriptor;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.84.1",
+  "version": "14.84.2",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",

package/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
   }

package/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
   }