@naturalcycles/js-lib 14.84.2 → 14.87.0

package/dist/decorators/memoFnAsync.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._memoFnAsync = void 0;
+const time_util_1 = require("../time/time.util");
+const decorator_util_1 = require("./decorator.util");
+const memo_util_1 = require("./memo.util");
+/**
+ * Only supports Sync functions.
+ * To support Async functions - use _memoFnAsync
+ */
+function _memoFnAsync(fn, opt = {}) {
+    const { logHit = false, logMiss = false, logArgs = true, logger = console, cacheRejections = true, cacheFactory = () => new memo_util_1.MapMemoCache(), cacheKeyFn = memo_util_1.jsonMemoSerializer, } = opt;
+    const cache = cacheFactory();
+    const fnName = fn.name;
+    const memoizedFn = async function (...args) {
+        const ctx = this;
+        const cacheKey = cacheKeyFn(args);
+        let value;
+        try {
+            value = await cache.get(cacheKey);
+        }
+        catch (err) {
+            logger.error(err);
+        }
+        if (value !== undefined) {
+            if (logHit) {
+                logger.log(`${fnName}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) memoFnAsync hit`);
+            }
+            if (value instanceof Error) {
+                throw value;
+            }
+            return value;
+        }
+        const started = Date.now();
+        try {
+            value = await fn.apply(ctx, args);
+            void (async () => {
+                try {
+                    await cache.set(cacheKey, value);
+                }
+                catch (err) {
+                    logger.error(err);
+                }
+            })();
+            return value;
+        }
+        catch (err) {
+            if (cacheRejections) {
+                void (async () => {
+                    try {
+                        await cache.set(cacheKey, err);
+                    }
+                    catch (err) {
+                        logger.error(err);
+                    }
+                })();
+            }
+            throw err;
+        }
+        finally {
+            if (logMiss) {
+                logger.log(`${fnName}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) memoFnAsync miss (${(0, time_util_1._since)(started)})`);
+            }
+        }
+    };
+    Object.assign(memoizedFn, { cache });
+    return memoizedFn;
+}
+exports._memoFnAsync = _memoFnAsync;

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

@@ -2,7 +2,7 @@ import { CommonLogger } from '../log/commonLogger';
 export interface MemoOpts {
     logHit?: boolean;
     logMiss?: boolean;
-    noLogArgs?: boolean;
+    logArgs?: boolean;
     logger?: CommonLogger;
 }
 /**

package/dist/decorators/memoSimple.decorator.js

@@ -37,7 +37,7 @@ const memoSimple = (opt = {}) => (target, key, descriptor) => {
   }
    */
     const cache = new memo_util_1.MapMemoCache();
-    const { logHit, logMiss, noLogArgs, logger = console } = opt;
+    const { logHit, logMiss, logArgs = true, logger = console } = opt;
     const keyStr = String(key);
     const methodSignature = (0, decorator_util_1._getTargetMethodSignature)(target, keyStr);
     descriptor.value = function (...args) {
@@ -45,14 +45,14 @@ const memoSimple = (opt = {}) => (target, key, descriptor) => {
         const cacheKey = (0, memo_util_1.jsonMemoSerializer)(args);
         if (cache.has(cacheKey)) {
             if (logHit) {
-                logger.log(`${methodSignature}(${(0, decorator_util_1._getArgsSignature)(args, noLogArgs)}) @memo hit`);
+                logger.log(`${methodSignature}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) @memo hit`);
             }
             return cache.get(cacheKey);
         }
         const d = Date.now();
         const res = originalFn.apply(ctx, args);
         if (logMiss) {
-            logger.log(`${methodSignature}(${(0, decorator_util_1._getArgsSignature)(args, noLogArgs)}) @memo miss (${Date.now() - d} ms)`);
+            logger.log(`${methodSignature}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) @memo miss (${Date.now() - d} ms)`);
         }
         cache.set(cacheKey, res);
         return res;

package/dist/index.d.ts

@@ -11,6 +11,7 @@ export * from './decorators/memo.decorator';
 export * from './decorators/asyncMemo.decorator';
 import { MemoCache, AsyncMemoCache } from './decorators/memo.util';
 export * from './decorators/memoFn';
+export * from './decorators/memoFnAsync';
 export * from './decorators/retry.decorator';
 export * from './decorators/timeout.decorator';
 export * from './error/app.error';
@@ -51,7 +52,7 @@ export * from './string/string.util';
 import { JsonStringifyFunction, StringifyAnyOptions, _stringifyAny } from './string/stringifyAny';
 export * from './time/time.util';
 import { Class, ConditionalExcept, ConditionalPick, Merge, Promisable, ReadonlyDeep, Simplify } from './typeFest';
-import { AsyncMapper, AsyncPredicate, BaseDBEntity, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, Saved, Unsaved, BatchResult, InstanceId, IsoDate, IsoDateTime, KeyValueTuple, Mapper, ObjectMapper, ObjectPredicate, Predicate, PromiseMap, AnyObject, AnyFunction, Reviver, SavedDBEntity, StringMap, UnixTimestamp, ValueOf, ValuesOf, AbortableMapper, AbortableAsyncPredicate, AbortableAsyncMapper, AbortablePredicate, END, SKIP, _noop, _objectKeys, _passNothingPredicate, _passthroughMapper, _passthroughPredicate, _passUndefinedMapper, _stringMapEntries, _stringMapValues } from './types';
+import { AsyncMapper, AsyncPredicate, BaseDBEntity, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, Saved, Unsaved, BatchResult, InstanceId, IsoDate, IsoDateTime, KeyValueTuple, Mapper, ObjectMapper, ObjectPredicate, Predicate, PromiseMap, AnyObject, AnyFunction, Reviver, SavedDBEntity, StringMap, UnixTimestamp, Integer, ValueOf, ValuesOf, AbortableMapper, AbortableAsyncPredicate, AbortableAsyncMapper, AbortablePredicate, END, SKIP, _noop, _objectKeys, _passNothingPredicate, _passthroughMapper, _passthroughPredicate, _passUndefinedMapper, _stringMapEntries, _stringMapValues } from './types';
 export * from './unit/size.util';
 import { is } from './vendor/is';
 import { CommonLogLevel, CommonLogFunction, CommonLogger, commonLoggerMinLevel, commonLoggerNoop, commonLogLevelNumber, commonLoggerPipe, commonLoggerPrefix, CommonLogWithLevelFunction, commonLoggerCreate } from './log/commonLogger';
@@ -59,5 +60,5 @@ export * from './string/safeJsonStringify';
 import { PQueue, PQueueCfg } from './promise/pQueue';
 export * from './seq/seq';
 export * from './math/stack.util';
-export type { AbortableMapper, AbortablePredicate, AbortableAsyncPredicate, AbortableAsyncMapper, PQueueCfg, MemoCache, AsyncMemoCache, PromiseDecoratorCfg, PromiseDecoratorResp, ErrorData, ErrorObject, HttpErrorData, HttpErrorResponse, Admin401ErrorData, Admin403ErrorData, StringMap, PromiseMap, AnyObject, AnyFunction, ValuesOf, ValueOf, KeyValueTuple, ObjectMapper, ObjectPredicate, InstanceId, IsoDate, IsoDateTime, Reviver, PMapOptions, Mapper, AsyncMapper, Predicate, AsyncPredicate, BatchResult, DeferredPromise, PRetryOptions, PTimeoutOptions, TryCatchOptions, StringifyAnyOptions, JsonStringifyFunction, Merge, ReadonlyDeep, Promisable, Simplify, ConditionalPick, ConditionalExcept, Class, UnixTimestamp, BaseDBEntity, SavedDBEntity, Saved, Unsaved, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, JsonSchema, JsonSchemaAny, JsonSchemaOneOf, JsonSchemaAllOf, JsonSchemaAnyOf, JsonSchemaNot, JsonSchemaRef, JsonSchemaConst, JsonSchemaEnum, JsonSchemaString, JsonSchemaNumber, JsonSchemaBoolean, JsonSchemaNull, JsonSchemaRootObject, JsonSchemaObject, JsonSchemaArray, JsonSchemaTuple, JsonSchemaBuilder, CommonLogLevel, CommonLogWithLevelFunction, CommonLogFunction, CommonLogger, };
+export type { AbortableMapper, AbortablePredicate, AbortableAsyncPredicate, AbortableAsyncMapper, PQueueCfg, MemoCache, AsyncMemoCache, PromiseDecoratorCfg, PromiseDecoratorResp, ErrorData, ErrorObject, HttpErrorData, HttpErrorResponse, Admin401ErrorData, Admin403ErrorData, StringMap, PromiseMap, AnyObject, AnyFunction, ValuesOf, ValueOf, KeyValueTuple, ObjectMapper, ObjectPredicate, InstanceId, IsoDate, IsoDateTime, Reviver, PMapOptions, Mapper, AsyncMapper, Predicate, AsyncPredicate, BatchResult, DeferredPromise, PRetryOptions, PTimeoutOptions, TryCatchOptions, StringifyAnyOptions, JsonStringifyFunction, Merge, ReadonlyDeep, Promisable, Simplify, ConditionalPick, ConditionalExcept, Class, UnixTimestamp, Integer, BaseDBEntity, SavedDBEntity, Saved, Unsaved, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, JsonSchema, JsonSchemaAny, JsonSchemaOneOf, JsonSchemaAllOf, JsonSchemaAnyOf, JsonSchemaNot, JsonSchemaRef, JsonSchemaConst, JsonSchemaEnum, JsonSchemaString, JsonSchemaNumber, JsonSchemaBoolean, JsonSchemaNull, JsonSchemaRootObject, JsonSchemaObject, JsonSchemaArray, JsonSchemaTuple, JsonSchemaBuilder, CommonLogLevel, CommonLogWithLevelFunction, CommonLogFunction, CommonLogger, };
 export { is, _createPromiseDecorator, _stringMapValues, _stringMapEntries, _objectKeys, pMap, _passthroughMapper, _passUndefinedMapper, _passthroughPredicate, _passNothingPredicate, _noop, ErrorMode, pDefer, AggregatedError, pRetry, pRetryFn, pTimeout, pTimeoutFn, _tryCatch, _TryCatch, _stringifyAny, jsonSchema, JsonSchemaAnyBuilder, commonLoggerMinLevel, commonLoggerNoop, commonLogLevelNumber, commonLoggerPipe, commonLoggerPrefix, commonLoggerCreate, PQueue, END, SKIP, };

package/dist/index.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "_createPromiseDecorator", { enumerable: true, ge
 (0, tslib_1.__exportStar)(require("./decorators/memo.decorator"), exports);
 (0, tslib_1.__exportStar)(require("./decorators/asyncMemo.decorator"), exports);
 (0, tslib_1.__exportStar)(require("./decorators/memoFn"), exports);
+(0, tslib_1.__exportStar)(require("./decorators/memoFnAsync"), exports);
 (0, tslib_1.__exportStar)(require("./decorators/retry.decorator"), exports);
 (0, tslib_1.__exportStar)(require("./decorators/timeout.decorator"), exports);
 (0, tslib_1.__exportStar)(require("./error/app.error"), exports);

package/dist/types.d.ts

@@ -124,6 +124,10 @@ export declare type IsoDateTime = string;
  * @example 1628945450
  */
 export declare type UnixTimestamp = number;
+/**
+ * Same as `number`, but with semantic meaning that it's an Integer.
+ */
+export declare type Integer = number;
 /**
  * Base interface for any Entity that was saved to DB.
  */

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 { jsonMemoSerializer } from './memo.util';
+import { jsonMemoSerializer, MapMemoCache } from './memo.util';
 /**
  * Like @_Memo, but allowing async MemoCache implementation.
  *
@@ -9,18 +8,17 @@ import { jsonMemoSerializer } from './memo.util';
  * Return `null` instead (it'll be cached).
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention
-export const _AsyncMemo = (opt) => (target, key, descriptor) => {
+export const _AsyncMemo = (opt = {}) => (target, key, descriptor) => {
     if (typeof descriptor.value !== 'function') {
         throw new TypeError('Memoization can be applied only to methods');
     }
     const originalFn = descriptor.value;
     // Map from "instance" of the Class where @_AsyncMemo is applied to AsyncMemoCache instance.
     const cache = new Map();
-    const { logHit = false, logMiss = false, noLogArgs = false, logger = console, cacheFactory, cacheKeyFn = jsonMemoSerializer, noCacheRejected = false, noCacheResolved = false, } = opt;
+    const { logHit = false, logMiss = false, logArgs = true, logger = console, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, cacheRejections = true, } = opt;
     const keyStr = String(key);
     const methodSignature = _getTargetMethodSignature(target, keyStr);
     descriptor.value = async function (...args) {
-        var e_1, _a;
         const ctx = this;
         const cacheKey = cacheKeyFn(args);
         if (!cache.has(ctx)) {
@@ -30,23 +28,7 @@ export const _AsyncMemo = (opt) => (target, key, descriptor) => {
         }
         let value;
         try {
-            try {
-                for (var _b = __asyncValues(cache.get(ctx)), _c; _c = await _b.next(), !_c.done;) {
-                    const cacheLayer = _c.value;
-                    value = await cacheLayer.get(cacheKey);
-                    if (value !== undefined) {
-                        // it's a hit!
-                        break;
-                    }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) await _a.call(_b);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
+            value = await cache.get(ctx).get(cacheKey);
         }
         catch (err) {
             // log error, but don't throw, treat it as a "miss"
@@ -55,42 +37,56 @@ export const _AsyncMemo = (opt) => (target, key, descriptor) => {
         if (value !== undefined) {
             // hit!
             if (logHit) {
-                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, noLogArgs)}) @_AsyncMemo hit`);
+                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, logArgs)}) @_AsyncMemo hit`);
             }
-            return value instanceof Error ? Promise.reject(value) : Promise.resolve(value);
+            if (value instanceof Error) {
+                throw value;
+            }
+            return value;
         }
         // Here we know it's a MISS, let's execute the real method
         const started = Date.now();
         try {
             value = await originalFn.apply(ctx, args);
-            if (!noCacheResolved) {
-                Promise.all(cache.get(ctx).map(cacheLayer => cacheLayer.set(cacheKey, value))).catch(err => {
+            // Save the value in the Cache, without awaiting it
+            // This is to support both sync and async functions
+            void (async () => {
+                try {
+                    await cache.get(ctx).set(cacheKey, value);
+                }
+                catch (err) {
                     // log and ignore the error
                     logger.error(err);
-                });
-            }
+                }
+            })();
             return value;
         }
         catch (err) {
-            if (!noCacheRejected) {
+            if (cacheRejections) {
                 // We put it to cache as raw Error, not Promise.reject(err)
-                Promise.all(cache.get(ctx).map(cacheLayer => cacheLayer.set(cacheKey, err))).catch(err => {
-                    // log and ignore the error
-                    logger.error(err);
-                });
+                // This is to support both sync and async functions
+                void (async () => {
+                    try {
+                        await cache.get(ctx).set(cacheKey, err);
+                    }
+                    catch (err) {
+                        // log and ignore the error
+                        logger.error(err);
+                    }
+                })();
             }
             throw err;
         }
         finally {
             if (logMiss) {
-                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, noLogArgs)}) @_AsyncMemo miss (${_since(started)})`);
+                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, logArgs)}) @_AsyncMemo miss (${_since(started)})`);
             }
         }
     };
     descriptor.value.dropCache = async () => {
         logger.log(`${methodSignature} @_AsyncMemo.dropCache()`);
         try {
-            await Promise.all([...cache.values()].flatMap(c => c.map(c => c.clear())));
+            await Promise.all([...cache.values()].map(c => c.clear()));
             cache.clear();
         }
         catch (err) {

package/dist-esm/decorators/createPromiseDecorator.js

@@ -19,14 +19,14 @@ export function _createPromiseDecorator(cfg, decoratorParams = {}) {
         const key = String(propertyKey);
         const methodSignature = _getTargetMethodSignature(target, key);
         pd.value = async function (...args) {
+            var _a, _b;
             // console.log(`@${cfg.decoratorName} called inside function`)
             const started = Date.now();
-            return (Promise.resolve()
+            try {
                 // Before function
-                .then(() => {
                 // console.log(`@${cfg.decoratorName} Before`)
                 if (cfg.beforeFn) {
-                    return cfg.beforeFn({
+                    await cfg.beforeFn({
                         decoratorParams,
                         args,
                         key,
@@ -35,11 +35,8 @@ export function _createPromiseDecorator(cfg, decoratorParams = {}) {
                         started,
                     });
                 }
-            })
                 // Original function
-                .then(() => originalMethod.apply(this, args))
-                .then(res => {
-                var _a;
+                let res = await originalMethod.apply(this, args);
                 // console.log(`${cfg.decoratorName} After`)
                 const resp = {
                     decoratorParams,
@@ -54,9 +51,8 @@ export function _createPromiseDecorator(cfg, decoratorParams = {}) {
                 }
                 (_a = cfg.finallyFn) === null || _a === void 0 ? void 0 : _a.call(cfg, resp);
                 return res;
-            })
-                .catch(err => {
-                var _a;
+            }
+            catch (err) {
                 console.error(`@${decoratorName} ${methodSignature} catch:`, err);
                 const resp = {
                     decoratorParams,
@@ -71,14 +67,11 @@ export function _createPromiseDecorator(cfg, decoratorParams = {}) {
                     cfg.catchFn(Object.assign(Object.assign({}, resp), { err }));
                     handled = true;
                 }
-                (_a = cfg.finallyFn) === null || _a === void 0 ? void 0 : _a.call(cfg, resp);
+                (_b = cfg.finallyFn) === null || _b === void 0 ? void 0 : _b.call(cfg, resp);
                 if (!handled) {
                     throw err; // rethrow
                 }
-            })
-            // es2018 only
-            // .finally(() => {})
-            );
+            }
         };
         return pd;
     };

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

@@ -19,8 +19,8 @@ export function _getTargetMethodSignature(target, keyStr) {
  * returns:
  * a, b, c
  */
-export function _getArgsSignature(args = [], noLogArgs = false) {
-    if (noLogArgs)
+export function _getArgsSignature(args = [], logArgs = true) {
+    if (!logArgs)
         return '';
     return args
         .map(arg => {

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

@@ -20,13 +20,13 @@ export function _LogMethod(opt = {}) {
         _assert(typeof descriptor.value === 'function', '@_LogMethod can be applied only to methods');
         const originalFn = descriptor.value;
         const keyStr = String(key);
-        const { avg, noLogArgs, logStart, logResult, noLogResultLength, logger = console } = opt;
+        const { avg, logArgs = true, logStart, logResult, logResultLength = true, logger = console, } = opt;
         let { logResultFn } = opt;
         if (!logResultFn) {
             if (logResult) {
                 logResultFn = r => ['result:', _stringifyAny(r)];
             }
-            else if (!noLogResultLength) {
+            else if (logResultLength) {
                 logResultFn = r => (Array.isArray(r) ? [`result: ${r.length} items`] : []);
             }
         }
@@ -38,7 +38,7 @@ export function _LogMethod(opt = {}) {
             // e.g `NameOfYourClass.methodName`
             // or `NameOfYourClass(instanceId).methodName`
             const methodSignature = _getMethodSignature(ctx, keyStr);
-            const argsStr = _getArgsSignature(args, noLogArgs);
+            const argsStr = _getArgsSignature(args, logArgs);
             const callSignature = `${methodSignature}(${argsStr}) #${++count}`;
             if (logStart)
                 logger.log(`>> ${callSignature}`);

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

@@ -1,8 +1,3 @@
-// Based on:
-// https://github.com/mgechev/memo-decorator/blob/master/index.ts
-// http://decodize.com/blog/2012/08/27/javascript-memoization-caching-results-for-better-performance/
-// http://inlehmansterms.net/2015/03/01/javascript-memoization/
-// https://community.risingstack.com/the-worlds-fastest-javascript-memoization-library/
 import { _since } from '../time/time.util';
 import { _getArgsSignature, _getMethodSignature, _getTargetMethodSignature } from './decorator.util';
 import { jsonMemoSerializer, MapMemoCache } from './memo.util';
@@ -15,6 +10,15 @@ import { jsonMemoSerializer, MapMemoCache } from './memo.util';
  * If you don't want it that way - you can use a static method, then there will be only one "instance".
  *
  * Supports dropping it's cache by calling .dropCache() method of decorated function (useful in unit testing).
+ *
+ * Doesn't support Async functions, use @_AsyncMemo instead!
+ * (or, it will simply return the [unresolved] Promise further, without awaiting it)
+ *
+ * Based on:
+ * https://github.com/mgechev/memo-decorator/blob/master/index.ts
+ * http://decodize.com/blog/2012/08/27/javascript-memoization-caching-results-for-better-performance/
+ * http://inlehmansterms.net/2015/03/01/javascript-memoization/
+ * https://community.risingstack.com/the-worlds-fastest-javascript-memoization-library/
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const _Memo = (opt = {}) => (target, key, descriptor) => {
@@ -30,62 +34,52 @@ export const _Memo = (opt = {}) => (target, key, descriptor) => {
     // UPD: tests show that normal Map also doesn't leak (to be tested further)
     // Normal Map is needed to allow .dropCache()
     const cache = new Map();
-    const { logHit = false, logMiss = false, noLogArgs = false, logger = console, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, noCacheRejected = false, noCacheResolved = false, } = opt;
-    const awaitPromise = Boolean(noCacheRejected || noCacheResolved);
+    const { logHit = false, logMiss = false, logArgs = true, logger = console, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, cacheErrors = true, } = opt;
     const keyStr = String(key);
     const methodSignature = _getTargetMethodSignature(target, keyStr);
     descriptor.value = function (...args) {
         const ctx = this;
         const cacheKey = cacheKeyFn(args);
+        let value;
         if (!cache.has(ctx)) {
             cache.set(ctx, cacheFactory());
         }
         else if (cache.get(ctx).has(cacheKey)) {
             if (logHit) {
-                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, noLogArgs)}) @_Memo hit`);
-            }
-            const res = cache.get(ctx).get(cacheKey);
-            if (awaitPromise) {
-                return res instanceof Error ? Promise.reject(res) : Promise.resolve(res);
+                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, logArgs)}) @_Memo hit`);
             }
-            else {
-                return res;
+            value = cache.get(ctx).get(cacheKey);
+            if (value instanceof Error) {
+                throw value;
             }
+            return value;
         }
         const started = Date.now();
-        const res = originalFn.apply(ctx, args);
-        if (awaitPromise) {
-            return res
-                .then(res => {
-                // console.log('RESOLVED', res)
-                if (logMiss) {
-                    logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, noLogArgs)}) @_Memo miss resolved (${_since(started)})`);
-                }
-                if (!noCacheResolved) {
-                    cache.get(ctx).set(cacheKey, res);
-                }
-                return res;
-            })
-                .catch(err => {
-                // console.log('REJECTED', err)
-                if (logMiss) {
-                    logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, noLogArgs)}) @_Memo miss rejected (${_since(started)})`);
+        try {
+            value = originalFn.apply(ctx, args);
+            try {
+                cache.get(ctx).set(cacheKey, value);
+            }
+            catch (err) {
+                logger.error(err);
+            }
+            return value;
+        }
+        catch (err) {
+            if (cacheErrors) {
+                try {
+                    cache.get(ctx).set(cacheKey, err);
                 }
-                if (!noCacheRejected) {
-                    // We put it to cache as raw Error, not Promise.reject(err)
-                    // So, we'll need to check if it's instanceof Error to reject it or resolve
-                    // Wrap as Error if it's not Error
-                    cache.get(ctx).set(cacheKey, err instanceof Error ? err : new Error(err));
+                catch (err) {
+                    logger.error(err);
                 }
-                throw err;
-            });
+            }
+            throw err;
         }
-        else {
+        finally {
             if (logMiss) {
-                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, noLogArgs)}) @_Memo miss (${_since(started)})`);
+                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, logArgs)}) @_Memo miss (${_since(started)})`);
             }
-            cache.get(ctx).set(cacheKey, res);
-            return res;
         }
     };
     descriptor.value.dropCache = () => {

package/dist-esm/decorators/memoFn.js

@@ -1,60 +1,55 @@
 import { _since } from '../time/time.util';
 import { _getArgsSignature } from './decorator.util';
 import { jsonMemoSerializer, MapMemoCache } from './memo.util';
+/**
+ * Only supports Sync functions.
+ * To support Async functions - use _memoFnAsync.
+ * Technically, you can use it with Async functions, but it'll return the Promise without awaiting it.
+ */
 export function _memoFn(fn, opt = {}) {
-    const { logHit = false, logMiss = false, noLogArgs = false, logger = console, noCacheRejected = false, noCacheResolved = false, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, } = opt;
+    const { logHit = false, logMiss = false, logArgs = true, logger = console, cacheErrors = true, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, } = opt;
     const cache = cacheFactory();
-    const awaitPromise = Boolean(noCacheRejected || noCacheResolved);
     const fnName = fn.name;
     const memoizedFn = function (...args) {
         const ctx = this;
         const cacheKey = cacheKeyFn(args);
+        let value;
         if (cache.has(cacheKey)) {
             if (logHit) {
-                logger.log(`${fnName}(${_getArgsSignature(args, noLogArgs)}) memoFn hit`);
+                logger.log(`${fnName}(${_getArgsSignature(args, logArgs)}) memoFn hit`);
             }
-            const res = cache.get(cacheKey);
-            if (awaitPromise) {
-                return res instanceof Error ? Promise.reject(res) : Promise.resolve(res);
-            }
-            else {
-                return res;
+            value = cache.get(cacheKey);
+            if (value instanceof Error) {
+                throw value;
             }
+            return value;
         }
         const started = Date.now();
-        const res = fn.apply(ctx, args);
-        if (awaitPromise) {
-            return res
-                .then(res => {
-                // console.log('RESOLVED', res)
-                if (logMiss) {
-                    logger.log(`${fnName}(${_getArgsSignature(args, noLogArgs)}) memoFn miss resolved (${_since(started)})`);
-                }
-                if (!noCacheResolved) {
-                    cache.set(cacheKey, res);
-                }
-                return res;
-            })
-                .catch(err => {
-                // console.log('REJECTED', err)
-                if (logMiss) {
-                    logger.log(`${fnName}(${_getArgsSignature(args, noLogArgs)}) memoFn miss rejected (${_since(started)})`);
+        try {
+            value = fn.apply(ctx, args);
+            try {
+                cache.set(cacheKey, value);
+            }
+            catch (err) {
+                logger.error(err);
+            }
+            return value;
+        }
+        catch (err) {
+            if (cacheErrors) {
+                try {
+                    cache.set(cacheKey, err);
                 }
-                if (!noCacheRejected) {
-                    // We put it to cache as raw Error, not Promise.reject(err)
-                    // So, we'll need to check if it's instanceof Error to reject it or resolve
-                    // Wrap as Error if it's not Error
-                    cache.set(cacheKey, err instanceof Error ? err : new Error(err));
+                catch (err) {
+                    logger.error(err);
                 }
-                throw err;
-            });
+            }
+            throw err;
         }
-        else {
+        finally {
             if (logMiss) {
-                logger.log(`${fnName}(${_getArgsSignature(args, noLogArgs)}) memoFn miss (${_since(started)})`);
+                logger.log(`${fnName}(${_getArgsSignature(args, logArgs)}) memoFn miss (${_since(started)})`);
             }
-            cache.set(cacheKey, res);
-            return res;
         }
     };
     Object.assign(memoizedFn, { cache });

package/dist-esm/decorators/memoFnAsync.js

@@ -0,0 +1,65 @@
+import { _since } from '../time/time.util';
+import { _getArgsSignature } from './decorator.util';
+import { jsonMemoSerializer, MapMemoCache } from './memo.util';
+/**
+ * Only supports Sync functions.
+ * To support Async functions - use _memoFnAsync
+ */
+export function _memoFnAsync(fn, opt = {}) {
+    const { logHit = false, logMiss = false, logArgs = true, logger = console, cacheRejections = true, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, } = opt;
+    const cache = cacheFactory();
+    const fnName = fn.name;
+    const memoizedFn = async function (...args) {
+        const ctx = this;
+        const cacheKey = cacheKeyFn(args);
+        let value;
+        try {
+            value = await cache.get(cacheKey);
+        }
+        catch (err) {
+            logger.error(err);
+        }
+        if (value !== undefined) {
+            if (logHit) {
+                logger.log(`${fnName}(${_getArgsSignature(args, logArgs)}) memoFnAsync hit`);
+            }
+            if (value instanceof Error) {
+                throw value;
+            }
+            return value;
+        }
+        const started = Date.now();
+        try {
+            value = await fn.apply(ctx, args);
+            void (async () => {
+                try {
+                    await cache.set(cacheKey, value);
+                }
+                catch (err) {
+                    logger.error(err);
+                }
+            })();
+            return value;
+        }
+        catch (err) {
+            if (cacheRejections) {
+                void (async () => {
+                    try {
+                        await cache.set(cacheKey, err);
+                    }
+                    catch (err) {
+                        logger.error(err);
+                    }
+                })();
+            }
+            throw err;
+        }
+        finally {
+            if (logMiss) {
+                logger.log(`${fnName}(${_getArgsSignature(args, logArgs)}) memoFnAsync miss (${_since(started)})`);
+            }
+        }
+    };
+    Object.assign(memoizedFn, { cache });
+    return memoizedFn;
+}