@naturalcycles/js-lib 14.213.0 → 14.214.0

package/dist/array/array.util.d.ts

@@ -104,6 +104,9 @@ export declare function _sortBy<T>(items: T[], mapper: Mapper<T, any>, mutate?:
 export declare function _sortDescBy<T>(items: T[], mapper: Mapper<T, any>, mutate?: boolean): T[];
 /**
  * Like items.find(), but it tries to find from the END of the array.
+ *
+ * Node 18+ supports native array.findLast() - use that.
+ * iOS Safari only has it since 15.4
  */
 export declare function _findLast<T>(items: T[], predicate: Predicate<T>): T | undefined;
 export declare function _takeWhile<T>(items: T[], predicate: Predicate<T>): T[];

package/dist/array/array.util.js

@@ -173,6 +173,9 @@ function _sortDescBy(items, mapper, mutate = false) {
 exports._sortDescBy = _sortDescBy;
 /**
  * Like items.find(), but it tries to find from the END of the array.
+ *
+ * Node 18+ supports native array.findLast() - use that.
+ * iOS Safari only has it since 15.4
  */
 function _findLast(items, predicate) {
     return [...items].reverse().find(predicate);

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

@@ -20,20 +20,6 @@ export interface AsyncMemoOptions {
      * False will allow >1 execution in case of errors.
      */
     cacheRejections?: boolean;
-    /**
-     * Default to false
-     */
-    logHit?: boolean;
-    /**
-     * Default to false
-     */
-    logMiss?: boolean;
-    /**
-     * Set to `false` to skip logging method arguments.
-     *
-     * Defaults to true.
-     */
-    logArgs?: boolean;
     /**
      * Default to `console`
      */
@@ -42,6 +28,10 @@ export interface AsyncMemoOptions {
 /**
  * Like @_Memo, but allowing async MemoCache implementation.
  *
+ * Important: it awaits the method to return the result before caching it.
+ *
+ * todo: test for "swarm requests", it should return "the same promise" and not cause a swarm origin hit
+ *
  * Method CANNOT return `undefined`, as undefined will always be treated as cache MISS and retried.
  * Return `null` instead (it'll be cached).
  */

package/dist/decorators/asyncMemo.decorator.js

@@ -1,12 +1,15 @@
 "use strict";
 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_util_1 = require("./memo.util");
 /**
  * Like @_Memo, but allowing async MemoCache implementation.
  *
+ * Important: it awaits the method to return the result before caching it.
+ *
+ * todo: test for "swarm requests", it should return "the same promise" and not cause a swarm origin hit
+ *
  * Method CANNOT return `undefined`, as undefined will always be treated as cache MISS and retried.
  * Return `null` instead (it'll be cached).
  */
@@ -18,7 +21,7 @@ const _AsyncMemo = (opt = {}) => (target, key, descriptor) => {
     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, logArgs = true, logger = console, cacheFactory = () => new memo_util_1.MapMemoCache(), cacheKeyFn = memo_util_1.jsonMemoSerializer, cacheRejections = true, } = opt;
+    const { logger = console, cacheFactory = () => new memo_util_1.MapMemoCache(), cacheKeyFn = memo_util_1.jsonMemoSerializer, cacheRejections = true, } = opt;
     const keyStr = String(key);
     const methodSignature = (0, decorator_util_1._getTargetMethodSignature)(target, keyStr);
     descriptor.value = async function (...args) {
@@ -39,16 +42,12 @@ const _AsyncMemo = (opt = {}) => (target, key, descriptor) => {
         }
         if (value !== undefined) {
             // hit!
-            if (logHit) {
-                logger.log(`${(0, decorator_util_1._getMethodSignature)(ctx, keyStr)}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) @_AsyncMemo hit`);
-            }
             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);
             // Save the value in the Cache, without awaiting it
@@ -80,11 +79,6 @@ const _AsyncMemo = (opt = {}) => (target, key, descriptor) => {
             }
             throw err;
         }
-        finally {
-            if (logMiss) {
-                logger.log(`${(0, decorator_util_1._getMethodSignature)(ctx, keyStr)}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) @_AsyncMemo miss (${(0, time_util_1._since)(started)})`);
-            }
-        }
     };
     descriptor.value.dropCache = async () => {
         logger.log(`${methodSignature} @_AsyncMemo.dropCache()`);

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

@@ -19,19 +19,6 @@ export interface MemoOptions {
      * False will allow >1 execution in case of errors.
      */
     cacheErrors?: boolean;
-    /**
-     * Default to false
-     */
-    logHit?: boolean;
-    /**
-     * Default to false
-     */
-    logMiss?: boolean;
-    /**
-     * Defaults to true.
-     * Set to false to skip logging method arguments.
-     */
-    logArgs?: boolean;
     /**
      * Default to `console`
      */

package/dist/decorators/memo.decorator.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
 /**
@@ -37,7 +36,7 @@ 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, logArgs = true, logger = console, cacheFactory = () => new memo_util_1.MapMemoCache(), cacheKeyFn = memo_util_1.jsonMemoSerializer, cacheErrors = true, } = opt;
+    const { logger = console, cacheFactory = () => new memo_util_1.MapMemoCache(), cacheKeyFn = memo_util_1.jsonMemoSerializer, cacheErrors = true, } = opt;
     const keyStr = String(key);
     const methodSignature = (0, decorator_util_1._getTargetMethodSignature)(target, keyStr);
     descriptor.value = function (...args) {
@@ -48,16 +47,12 @@ const _Memo = (opt = {}) => (target, key, descriptor) => {
             cache.set(ctx, cacheFactory());
         }
         else if (cache.get(ctx).has(cacheKey)) {
-            if (logHit) {
-                logger.log(`${(0, decorator_util_1._getMethodSignature)(ctx, keyStr)}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) @_Memo hit`);
-            }
             value = cache.get(ctx).get(cacheKey);
             if (value instanceof Error) {
                 throw value;
             }
             return value;
         }
-        const started = Date.now();
         try {
             value = originalFn.apply(ctx, args);
             try {
@@ -79,11 +74,6 @@ const _Memo = (opt = {}) => (target, key, descriptor) => {
             }
             throw err;
         }
-        finally {
-            if (logMiss) {
-                logger.log(`${(0, decorator_util_1._getMethodSignature)(ctx, keyStr)}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) @_Memo miss (${(0, time_util_1._since)(started)})`);
-            }
-        }
     };
     descriptor.value.dropCache = () => {
         logger.log(`${methodSignature} @_Memo.dropCache()`);

package/dist/decorators/memoFn.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._memoFn = 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.
@@ -10,24 +8,19 @@ const memo_util_1 = require("./memo.util");
  * Technically, you can use it with Async functions, but it'll return the Promise without awaiting it.
  */
 function _memoFn(fn, opt = {}) {
-    const { logHit = false, logMiss = false, logArgs = true, logger = console, cacheErrors = true, cacheFactory = () => new memo_util_1.MapMemoCache(), cacheKeyFn = memo_util_1.jsonMemoSerializer, } = opt;
+    const { logger = console, cacheErrors = true, cacheFactory = () => new memo_util_1.MapMemoCache(), cacheKeyFn = memo_util_1.jsonMemoSerializer, } = opt;
     const cache = cacheFactory();
-    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}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) memoFn hit`);
-            }
             value = cache.get(cacheKey);
             if (value instanceof Error) {
                 throw value;
             }
             return value;
         }
-        const started = Date.now();
         try {
             value = fn.apply(ctx, args);
             try {
@@ -49,11 +42,6 @@ function _memoFn(fn, opt = {}) {
             }
             throw err;
         }
-        finally {
-            if (logMiss) {
-                logger.log(`${fnName}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) memoFn miss (${(0, time_util_1._since)(started)})`);
-            }
-        }
     };
     Object.assign(memoizedFn, { cache });
     return memoizedFn;

package/dist/decorators/memoFnAsync.js

@@ -1,17 +1,14 @@
 "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 { 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);
@@ -23,15 +20,11 @@ function _memoFnAsync(fn, opt = {}) {
             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 () => {
@@ -57,11 +50,6 @@ function _memoFnAsync(fn, opt = {}) {
             }
             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;

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

@@ -1,8 +1,5 @@
 import type { CommonLogger } from '../log/commonLogger';
 export interface MemoOpts {
-    logHit?: boolean;
-    logMiss?: boolean;
-    logArgs?: boolean;
     logger?: CommonLogger;
 }
 /**

package/dist/decorators/memoSimple.decorator.js

@@ -37,23 +37,16 @@ const memoSimple = (opt = {}) => (target, key, descriptor) => {
   }
    */
     const cache = new memo_util_1.MapMemoCache();
-    const { logHit, logMiss, logArgs = true, logger = console } = opt;
+    const { logger = console } = opt;
     const keyStr = String(key);
     const methodSignature = (0, decorator_util_1._getTargetMethodSignature)(target, keyStr);
     descriptor.value = function (...args) {
         const ctx = this;
         const cacheKey = (0, memo_util_1.jsonMemoSerializer)(args);
         if (cache.has(cacheKey)) {
-            if (logHit) {
-                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, logArgs)}) @memo miss (${Date.now() - d} ms)`);
-        }
         cache.set(cacheKey, res);
         return res;
     };

package/dist/index.d.ts

@@ -35,6 +35,8 @@ export * from './object/deepEquals';
 export * from './object/object.util';
 export * from './object/sortObject';
 export * from './object/sortObjectDeep';
+export * from './object/map2';
+export * from './object/set2';
 export * from './promise/pDefer';
 export * from './promise/pDelay';
 export * from './promise/pFilter';

package/dist/index.js

@@ -39,6 +39,8 @@ tslib_1.__exportStar(require("./object/deepEquals"), exports);
 tslib_1.__exportStar(require("./object/object.util"), exports);
 tslib_1.__exportStar(require("./object/sortObject"), exports);
 tslib_1.__exportStar(require("./object/sortObjectDeep"), exports);
+tslib_1.__exportStar(require("./object/map2"), exports);
+tslib_1.__exportStar(require("./object/set2"), exports);
 tslib_1.__exportStar(require("./promise/pDefer"), exports);
 tslib_1.__exportStar(require("./promise/pDelay"), exports);
 tslib_1.__exportStar(require("./promise/pFilter"), exports);

package/dist/object/map2.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Like Map, but serializes to JSON as an object.
+ *
+ * Fixes the "issue" of stock Map being json-serialized as `{}`.
+ *
+ * @experimental
+ */
+export declare class Map2<K = any, V = any> extends Map<K, V> {
+    /**
+     * Convenience way to create Map2 from object.
+     */
+    static of<V>(obj: Record<any, V>): Map2<string, V>;
+    toObject(): Record<string, V>;
+    toJSON(): Record<string, V>;
+}

package/dist/object/map2.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Map2 = void 0;
+/**
+ * Like Map, but serializes to JSON as an object.
+ *
+ * Fixes the "issue" of stock Map being json-serialized as `{}`.
+ *
+ * @experimental
+ */
+class Map2 extends Map {
+    /**
+     * Convenience way to create Map2 from object.
+     */
+    static of(obj) {
+        return new Map2(Object.entries(obj));
+    }
+    toObject() {
+        return Object.fromEntries(this);
+    }
+    toJSON() {
+        return Object.fromEntries(this);
+    }
+}
+exports.Map2 = Map2;

package/dist/object/object.util.d.ts

@@ -1,4 +1,3 @@
-import type { PropertyPath } from '../lodash.types';
 import { KeyValueTuple, Reviver, SKIP } from '../types';
 import type { AnyObject, ObjectMapper, ObjectPredicate, ValueOf } from '../types';
 /**
@@ -146,6 +145,8 @@ export declare function _invertMap<K, V>(m: ReadonlyMap<K, V>): Map<V, K>;
  * _get(obj, 'unknown.path') // undefined
  */
 export declare function _get<T extends AnyObject>(obj?: T, path?: string): unknown;
+type Many<T> = T | readonly T[];
+type PropertyPath = Many<PropertyKey>;
 /**
  * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
  * missing index properties while objects are created for all other missing properties.
@@ -207,3 +208,4 @@ export declare function _deepFreeze(o: any): void;
  * To make mutation extra clear - function returns void (unlike Object.assign).
  */
 export declare function _objectAssignExact<T extends AnyObject>(target: T, source: T): void;
+export {};

package/dist/object/set2.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Like Set, but serializes to JSON as an array.
+ *
+ * Fixes the "issue" of stock Set being json-serialized as `{}`.
+ *
+ * @experimental
+ */
+export declare class Set2<T = any> extends Set<T> {
+    toArray(): T[];
+    toJSON(): T[];
+}

package/dist/object/set2.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Set2 = void 0;
+/**
+ * Like Set, but serializes to JSON as an array.
+ *
+ * Fixes the "issue" of stock Set being json-serialized as `{}`.
+ *
+ * @experimental
+ */
+class Set2 extends Set {
+    toArray() {
+        return [...this];
+    }
+    toJSON() {
+        return [...this];
+    }
+}
+exports.Set2 = Set2;

package/dist/string/stringify.js

@@ -111,6 +111,12 @@ function _stringify(obj, opt = {}) {
         //
         // Other
         //
+        if (obj instanceof Map) {
+            obj = Object.fromEntries(obj);
+        }
+        else if (obj instanceof Set) {
+            obj = [...obj];
+        }
         try {
             const { stringifyFn = globalStringifyFunction } = opt;
             s = stringifyFn(obj, undefined, 2);

package/dist-esm/array/array.util.js

@@ -160,6 +160,9 @@ export function _sortDescBy(items, mapper, mutate = false) {
 }
 /**
  * Like items.find(), but it tries to find from the END of the array.
+ *
+ * Node 18+ supports native array.findLast() - use that.
+ * iOS Safari only has it since 15.4
  */
 export function _findLast(items, predicate) {
     return [...items].reverse().find(predicate);

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

@@ -1,9 +1,12 @@
-import { _since } from '../time/time.util';
-import { _getArgsSignature, _getMethodSignature, _getTargetMethodSignature } from './decorator.util';
+import { _getTargetMethodSignature } from './decorator.util';
 import { jsonMemoSerializer, MapMemoCache } from './memo.util';
 /**
  * Like @_Memo, but allowing async MemoCache implementation.
  *
+ * Important: it awaits the method to return the result before caching it.
+ *
+ * todo: test for "swarm requests", it should return "the same promise" and not cause a swarm origin hit
+ *
  * Method CANNOT return `undefined`, as undefined will always be treated as cache MISS and retried.
  * Return `null` instead (it'll be cached).
  */
@@ -15,7 +18,7 @@ export const _AsyncMemo = (opt = {}) => (target, key, descriptor) => {
     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, logArgs = true, logger = console, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, cacheRejections = true, } = opt;
+    const { logger = console, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, cacheRejections = true, } = opt;
     const keyStr = String(key);
     const methodSignature = _getTargetMethodSignature(target, keyStr);
     descriptor.value = async function (...args) {
@@ -36,16 +39,12 @@ export const _AsyncMemo = (opt = {}) => (target, key, descriptor) => {
         }
         if (value !== undefined) {
             // hit!
-            if (logHit) {
-                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, logArgs)}) @_AsyncMemo hit`);
-            }
             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);
             // Save the value in the Cache, without awaiting it
@@ -77,11 +76,6 @@ export const _AsyncMemo = (opt = {}) => (target, key, descriptor) => {
             }
             throw err;
         }
-        finally {
-            if (logMiss) {
-                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, logArgs)}) @_AsyncMemo miss (${_since(started)})`);
-            }
-        }
     };
     descriptor.value.dropCache = async () => {
         logger.log(`${methodSignature} @_AsyncMemo.dropCache()`);

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

@@ -1,5 +1,4 @@
-import { _since } from '../time/time.util';
-import { _getArgsSignature, _getMethodSignature, _getTargetMethodSignature } from './decorator.util';
+import { _getTargetMethodSignature } from './decorator.util';
 import { jsonMemoSerializer, MapMemoCache } from './memo.util';
 /**
  * Memoizes the method of the class, so it caches the output and returns the cached version if the "key"
@@ -34,7 +33,7 @@ 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, logArgs = true, logger = console, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, cacheErrors = true, } = opt;
+    const { logger = console, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, cacheErrors = true, } = opt;
     const keyStr = String(key);
     const methodSignature = _getTargetMethodSignature(target, keyStr);
     descriptor.value = function (...args) {
@@ -45,16 +44,12 @@ export const _Memo = (opt = {}) => (target, key, descriptor) => {
             cache.set(ctx, cacheFactory());
         }
         else if (cache.get(ctx).has(cacheKey)) {
-            if (logHit) {
-                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, logArgs)}) @_Memo hit`);
-            }
             value = cache.get(ctx).get(cacheKey);
             if (value instanceof Error) {
                 throw value;
             }
             return value;
         }
-        const started = Date.now();
         try {
             value = originalFn.apply(ctx, args);
             try {
@@ -76,11 +71,6 @@ export const _Memo = (opt = {}) => (target, key, descriptor) => {
             }
             throw err;
         }
-        finally {
-            if (logMiss) {
-                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, logArgs)}) @_Memo miss (${_since(started)})`);
-            }
-        }
     };
     descriptor.value.dropCache = () => {
         logger.log(`${methodSignature} @_Memo.dropCache()`);

package/dist-esm/decorators/memoFn.js

@@ -1,5 +1,3 @@
-import { _since } from '../time/time.util';
-import { _getArgsSignature } from './decorator.util';
 import { jsonMemoSerializer, MapMemoCache } from './memo.util';
 /**
  * Only supports Sync functions.
@@ -7,24 +5,19 @@ import { jsonMemoSerializer, MapMemoCache } from './memo.util';
  * 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, logArgs = true, logger = console, cacheErrors = true, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, } = opt;
+    const { logger = console, cacheErrors = true, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, } = opt;
     const cache = cacheFactory();
-    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, logArgs)}) memoFn hit`);
-            }
             value = cache.get(cacheKey);
             if (value instanceof Error) {
                 throw value;
             }
             return value;
         }
-        const started = Date.now();
         try {
             value = fn.apply(ctx, args);
             try {
@@ -46,11 +39,6 @@ export function _memoFn(fn, opt = {}) {
             }
             throw err;
         }
-        finally {
-            if (logMiss) {
-                logger.log(`${fnName}(${_getArgsSignature(args, logArgs)}) memoFn miss (${_since(started)})`);
-            }
-        }
     };
     Object.assign(memoizedFn, { cache });
     return memoizedFn;

package/dist-esm/decorators/memoFnAsync.js

@@ -1,14 +1,11 @@
-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 { 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);
@@ -20,15 +17,11 @@ export function _memoFnAsync(fn, opt = {}) {
             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 () => {
@@ -54,11 +47,6 @@ export function _memoFnAsync(fn, opt = {}) {
             }
             throw err;
         }
-        finally {
-            if (logMiss) {
-                logger.log(`${fnName}(${_getArgsSignature(args, logArgs)}) memoFnAsync miss (${_since(started)})`);
-            }
-        }
     };
     Object.assign(memoizedFn, { cache });
     return memoizedFn;

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

@@ -3,7 +3,7 @@
 // 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 { _getArgsSignature, _getTargetMethodSignature } from './decorator.util';
+import { _getTargetMethodSignature } from './decorator.util';
 import { jsonMemoSerializer, MapMemoCache } from './memo.util';
 // memoSimple decorator is NOT exported. Only used in benchmarks currently
 /**
@@ -34,23 +34,16 @@ export const memoSimple = (opt = {}) => (target, key, descriptor) => {
   }
    */
     const cache = new MapMemoCache();
-    const { logHit, logMiss, logArgs = true, logger = console } = opt;
+    const { logger = console } = opt;
     const keyStr = String(key);
     const methodSignature = _getTargetMethodSignature(target, keyStr);
     descriptor.value = function (...args) {
         const ctx = this;
         const cacheKey = jsonMemoSerializer(args);
         if (cache.has(cacheKey)) {
-            if (logHit) {
-                logger.log(`${methodSignature}(${_getArgsSignature(args, logArgs)}) @memo hit`);
-            }
             return cache.get(cacheKey);
         }
-        const d = Date.now();
         const res = originalFn.apply(ctx, args);
-        if (logMiss) {
-            logger.log(`${methodSignature}(${_getArgsSignature(args, logArgs)}) @memo miss (${Date.now() - d} ms)`);
-        }
         cache.set(cacheKey, res);
         return res;
     };

package/dist-esm/index.js

@@ -35,6 +35,8 @@ export * from './object/deepEquals';
 export * from './object/object.util';
 export * from './object/sortObject';
 export * from './object/sortObjectDeep';
+export * from './object/map2';
+export * from './object/set2';
 export * from './promise/pDefer';
 export * from './promise/pDelay';
 export * from './promise/pFilter';

package/dist-esm/object/map2.js

@@ -0,0 +1,21 @@
+/**
+ * Like Map, but serializes to JSON as an object.
+ *
+ * Fixes the "issue" of stock Map being json-serialized as `{}`.
+ *
+ * @experimental
+ */
+export class Map2 extends Map {
+    /**
+     * Convenience way to create Map2 from object.
+     */
+    static of(obj) {
+        return new Map2(Object.entries(obj));
+    }
+    toObject() {
+        return Object.fromEntries(this);
+    }
+    toJSON() {
+        return Object.fromEntries(this);
+    }
+}

package/dist-esm/object/set2.js

@@ -0,0 +1,15 @@
+/**
+ * Like Set, but serializes to JSON as an array.
+ *
+ * Fixes the "issue" of stock Set being json-serialized as `{}`.
+ *
+ * @experimental
+ */
+export class Set2 extends Set {
+    toArray() {
+        return [...this];
+    }
+    toJSON() {
+        return [...this];
+    }
+}

package/dist-esm/string/stringify.js

@@ -107,6 +107,12 @@ export function _stringify(obj, opt = {}) {
         //
         // Other
         //
+        if (obj instanceof Map) {
+            obj = Object.fromEntries(obj);
+        }
+        else if (obj instanceof Set) {
+            obj = [...obj];
+        }
         try {
             const { stringifyFn = globalStringifyFunction } = opt;
             s = stringifyFn(obj, undefined, 2);

package/package.json

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

package/src/array/array.util.ts

@@ -196,6 +196,9 @@ export function _sortDescBy<T>(items: T[], mapper: Mapper<T, any>, mutate = fals
 
 /**
  * Like items.find(), but it tries to find from the END of the array.
+ *
+ * Node 18+ supports native array.findLast() - use that.
+ * iOS Safari only has it since 15.4
  */
 export function _findLast<T>(items: T[], predicate: Predicate<T>): T | undefined {
   return [...items].reverse().find(predicate)

package/src/decorators/asyncMemo.decorator.ts

@@ -1,7 +1,6 @@
 import type { CommonLogger } from '../log/commonLogger'
-import { _since } from '../time/time.util'
 import type { AnyObject } from '../types'
-import { _getArgsSignature, _getMethodSignature, _getTargetMethodSignature } from './decorator.util'
+import { _getTargetMethodSignature } from './decorator.util'
 import type { AsyncMemoCache } from './memo.util'
 import { jsonMemoSerializer, MapMemoCache } from './memo.util'
 
@@ -28,23 +27,6 @@ export interface AsyncMemoOptions {
    */
   cacheRejections?: boolean
 
-  /**
-   * Default to false
-   */
-  logHit?: boolean
-
-  /**
-   * Default to false
-   */
-  logMiss?: boolean
-
-  /**
-   * Set to `false` to skip logging method arguments.
-   *
-   * Defaults to true.
-   */
-  logArgs?: boolean
-
   /**
    * Default to `console`
    */
@@ -54,6 +36,10 @@ export interface AsyncMemoOptions {
 /**
  * Like @_Memo, but allowing async MemoCache implementation.
  *
+ * Important: it awaits the method to return the result before caching it.
+ *
+ * todo: test for "swarm requests", it should return "the same promise" and not cause a swarm origin hit
+ *
  * Method CANNOT return `undefined`, as undefined will always be treated as cache MISS and retried.
  * Return `null` instead (it'll be cached).
  */
@@ -71,9 +57,6 @@ export const _AsyncMemo =
     const cache = new Map<AnyObject, AsyncMemoCache>()
 
     const {
-      logHit = false,
-      logMiss = false,
-      logArgs = true,
       logger = console,
       cacheFactory = () => new MapMemoCache(),
       cacheKeyFn = jsonMemoSerializer,
@@ -105,15 +88,6 @@ export const _AsyncMemo =
 
       if (value !== undefined) {
         // hit!
-        if (logHit) {
-          logger.log(
-            `${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(
-              args,
-              logArgs,
-            )}) @_AsyncMemo hit`,
-          )
-        }
-
         if (value instanceof Error) {
           throw value
         }
@@ -122,8 +96,6 @@ export const _AsyncMemo =
       }
 
       // Here we know it's a MISS, let's execute the real method
-      const started = Date.now()
-
       try {
         value = await originalFn.apply(ctx, args)
 
@@ -154,15 +126,6 @@ export const _AsyncMemo =
         }
 
         throw err
-      } finally {
-        if (logMiss) {
-          logger.log(
-            `${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(
-              args,
-              logArgs,
-            )}) @_AsyncMemo miss (${_since(started)})`,
-          )
-        }
       }
     } as any
     ;(descriptor.value as any).dropCache = async () => {

package/src/decorators/memo.decorator.ts

@@ -1,7 +1,6 @@
 import type { CommonLogger } from '../log/commonLogger'
-import { _since } from '../time/time.util'
 import type { AnyObject } from '../types'
-import { _getArgsSignature, _getMethodSignature, _getTargetMethodSignature } from './decorator.util'
+import { _getTargetMethodSignature } from './decorator.util'
 import type { MemoCache } from './memo.util'
 import { jsonMemoSerializer, MapMemoCache } from './memo.util'
 
@@ -27,21 +26,6 @@ export interface MemoOptions {
    */
   cacheErrors?: boolean
 
-  /**
-   * Default to false
-   */
-  logHit?: boolean
-  /**
-   * Default to false
-   */
-  logMiss?: boolean
-
-  /**
-   * Defaults to true.
-   * Set to false to skip logging method arguments.
-   */
-  logArgs?: boolean
-
   /**
    * Default to `console`
    */
@@ -87,9 +71,6 @@ export const _Memo =
     const cache = new Map<AnyObject, MemoCache>()
 
     const {
-      logHit = false,
-      logMiss = false,
-      logArgs = true,
       logger = console,
       cacheFactory = () => new MapMemoCache(),
       cacheKeyFn = jsonMemoSerializer,
@@ -107,12 +88,6 @@ export const _Memo =
       if (!cache.has(ctx)) {
         cache.set(ctx, cacheFactory())
       } else if (cache.get(ctx)!.has(cacheKey)) {
-        if (logHit) {
-          logger.log(
-            `${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, logArgs)}) @_Memo hit`,
-          )
-        }
-
         value = cache.get(ctx)!.get(cacheKey)
 
         if (value instanceof Error) {
@@ -122,8 +97,6 @@ export const _Memo =
         return value
       }
 
-      const started = Date.now()
-
       try {
         value = originalFn.apply(ctx, args)
 
@@ -144,15 +117,6 @@ export const _Memo =
         }
 
         throw err
-      } finally {
-        if (logMiss) {
-          logger.log(
-            `${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(
-              args,
-              logArgs,
-            )}) @_Memo miss (${_since(started)})`,
-          )
-        }
       }
     } as any
     ;(descriptor.value as any).dropCache = () => {

package/src/decorators/memoFn.ts

@@ -1,5 +1,3 @@
-import { _since } from '../time/time.util'
-import { _getArgsSignature } from './decorator.util'
 import type { MemoOptions } from './memo.decorator'
 import type { MemoCache } from './memo.util'
 import { jsonMemoSerializer, MapMemoCache } from './memo.util'
@@ -18,9 +16,6 @@ export function _memoFn<T extends (...args: any[]) => any>(
   opt: MemoOptions = {},
 ): T & MemoizedFunction {
   const {
-    logHit = false,
-    logMiss = false,
-    logArgs = true,
     logger = console,
     cacheErrors = true,
     cacheFactory = () => new MapMemoCache(),
@@ -28,7 +23,6 @@ export function _memoFn<T extends (...args: any[]) => any>(
   } = opt
 
   const cache = cacheFactory()
-  const fnName = fn.name
 
   const memoizedFn = function (this: any, ...args: any[]): T {
     const ctx = this
@@ -36,10 +30,6 @@ export function _memoFn<T extends (...args: any[]) => any>(
     let value: any
 
     if (cache.has(cacheKey)) {
-      if (logHit) {
-        logger.log(`${fnName}(${_getArgsSignature(args, logArgs)}) memoFn hit`)
-      }
-
       value = cache.get(cacheKey)
 
       if (value instanceof Error) {
@@ -49,8 +39,6 @@ export function _memoFn<T extends (...args: any[]) => any>(
       return value
     }
 
-    const started = Date.now()
-
     try {
       value = fn.apply(ctx, args)
 
@@ -71,12 +59,6 @@ export function _memoFn<T extends (...args: any[]) => any>(
       }
 
       throw err
-    } finally {
-      if (logMiss) {
-        logger.log(
-          `${fnName}(${_getArgsSignature(args, logArgs)}) memoFn miss (${_since(started)})`,
-        )
-      }
     }
   }
 

package/src/decorators/memoFnAsync.ts

@@ -1,6 +1,4 @@
-import { _since } from '../time/time.util'
 import type { AsyncMemoOptions } from './asyncMemo.decorator'
-import { _getArgsSignature } from './decorator.util'
 import type { AsyncMemoCache } from './memo.util'
 import { jsonMemoSerializer, MapMemoCache } from './memo.util'
 
@@ -17,9 +15,6 @@ export function _memoFnAsync<T extends (...args: any[]) => Promise<any>>(
   opt: AsyncMemoOptions = {},
 ): T & MemoizedAsyncFunction {
   const {
-    logHit = false,
-    logMiss = false,
-    logArgs = true,
     logger = console,
     cacheRejections = true,
     cacheFactory = () => new MapMemoCache(),
@@ -27,7 +22,6 @@ export function _memoFnAsync<T extends (...args: any[]) => Promise<any>>(
   } = opt
 
   const cache = cacheFactory()
-  const fnName = fn.name
 
   const memoizedFn = async function (this: any, ...args: any[]): Promise<any> {
     const ctx = this
@@ -41,10 +35,6 @@ export function _memoFnAsync<T extends (...args: any[]) => Promise<any>>(
     }
 
     if (value !== undefined) {
-      if (logHit) {
-        logger.log(`${fnName}(${_getArgsSignature(args, logArgs)}) memoFnAsync hit`)
-      }
-
       if (value instanceof Error) {
         throw value
       }
@@ -52,8 +42,6 @@ export function _memoFnAsync<T extends (...args: any[]) => Promise<any>>(
       return value
     }
 
-    const started = Date.now()
-
     try {
       value = await fn.apply(ctx, args)
 
@@ -78,12 +66,6 @@ export function _memoFnAsync<T extends (...args: any[]) => Promise<any>>(
       }
 
       throw err
-    } finally {
-      if (logMiss) {
-        logger.log(
-          `${fnName}(${_getArgsSignature(args, logArgs)}) memoFnAsync miss (${_since(started)})`,
-        )
-      }
     }
   }
 

package/src/decorators/memoSimple.decorator.ts

@@ -12,14 +12,11 @@ Benchmark shows similar perf for ObjectCache and MapCache.
  */
 
 import type { CommonLogger } from '../log/commonLogger'
-import { _getArgsSignature, _getTargetMethodSignature } from './decorator.util'
+import { _getTargetMethodSignature } from './decorator.util'
 import type { MemoCache } from './memo.util'
 import { jsonMemoSerializer, MapMemoCache } from './memo.util'
 
 export interface MemoOpts {
-  logHit?: boolean
-  logMiss?: boolean
-  logArgs?: boolean
   logger?: CommonLogger
 }
 
@@ -58,7 +55,7 @@ export const memoSimple =
    */
     const cache: MemoCache = new MapMemoCache()
 
-    const { logHit, logMiss, logArgs = true, logger = console } = opt
+    const { logger = console } = opt
     const keyStr = String(key)
     const methodSignature = _getTargetMethodSignature(target, keyStr)
 
@@ -67,26 +64,11 @@ export const memoSimple =
       const cacheKey = jsonMemoSerializer(args)
 
       if (cache.has(cacheKey)) {
-        if (logHit) {
-          logger.log(`${methodSignature}(${_getArgsSignature(args, logArgs)}) @memo hit`)
-        }
         return cache.get(cacheKey)
       }
 
-      const d = Date.now()
-
       const res: any = originalFn.apply(ctx, args)
-
-      if (logMiss) {
-        logger.log(
-          `${methodSignature}(${_getArgsSignature(args, logArgs)}) @memo miss (${
-            Date.now() - d
-          } ms)`,
-        )
-      }
-
       cache.set(cacheKey, res)
-
       return res
     } as any
     ;(descriptor.value as any).dropCache = () => {

package/src/index.ts

@@ -35,6 +35,8 @@ export * from './object/deepEquals'
 export * from './object/object.util'
 export * from './object/sortObject'
 export * from './object/sortObjectDeep'
+export * from './object/map2'
+export * from './object/set2'
 export * from './promise/pDefer'
 export * from './promise/pDelay'
 export * from './promise/pFilter'

package/src/object/map2.ts

@@ -0,0 +1,25 @@
+/**
+ * Like Map, but serializes to JSON as an object.
+ *
+ * Fixes the "issue" of stock Map being json-serialized as `{}`.
+ *
+ * @experimental
+ */
+export class Map2<K = any, V = any> extends Map<K, V> {
+  /**
+   * Convenience way to create Map2 from object.
+   */
+  static of<V>(obj: Record<any, V>): Map2<string, V> {
+    return new Map2(Object.entries(obj))
+  }
+
+  toObject(): Record<string, V> {
+    return Object.fromEntries(this)
+  }
+
+  toJSON(): Record<string, V> {
+    return Object.fromEntries(this)
+  }
+
+  // consider more helpful .toString() ?
+}

package/src/object/object.util.ts

@@ -1,5 +1,4 @@
 import { _isEmpty, _isObject } from '../is.util'
-import type { PropertyPath } from '../lodash.types'
 import { _objectEntries, KeyValueTuple, Reviver, SKIP } from '../types'
 import type { AnyObject, ObjectMapper, ObjectPredicate, ValueOf } from '../types'
 
@@ -328,6 +327,9 @@ export function _get<T extends AnyObject>(obj = {} as T, path = ''): unknown {
     .reduce((o, p) => o?.[p], obj)
 }
 
+type Many<T> = T | readonly T[]
+type PropertyPath = Many<PropertyKey>
+
 /**
  * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
  * missing index properties while objects are created for all other missing properties.

package/src/object/set2.ts

@@ -0,0 +1,18 @@
+/**
+ * Like Set, but serializes to JSON as an array.
+ *
+ * Fixes the "issue" of stock Set being json-serialized as `{}`.
+ *
+ * @experimental
+ */
+export class Set2<T = any> extends Set<T> {
+  toArray(): T[] {
+    return [...this]
+  }
+
+  toJSON(): T[] {
+    return [...this]
+  }
+
+  // consider more helpful .toString() ?
+}

package/src/string/stringify.ts

@@ -158,6 +158,12 @@ export function _stringify(obj: any, opt: StringifyOptions = {}): string {
     //
     // Other
     //
+    if (obj instanceof Map) {
+      obj = Object.fromEntries(obj)
+    } else if (obj instanceof Set) {
+      obj = [...obj]
+    }
+
     try {
       const { stringifyFn = globalStringifyFunction } = opt
 

package/dist/lodash.types.d.ts

@@ -1,4 +0,0 @@
-export type PropertyName = string | number | symbol;
-export type RecursiveArray<T> = (T | RecursiveArray<T>)[];
-export type Many<T> = T | readonly T[];
-export type PropertyPath = Many<PropertyName>;

package/dist/lodash.types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist-esm/lodash.types.js

@@ -1 +0,0 @@
-export {};

package/src/lodash.types.ts

@@ -1,6 +0,0 @@
-export type PropertyName = string | number | symbol
-
-export type RecursiveArray<T> = (T | RecursiveArray<T>)[]
-
-export type Many<T> = T | readonly T[]
-export type PropertyPath = Many<PropertyName>