@naturalcycles/js-lib 14.201.0 → 14.202.0

package/dist/promise/pMap.d.ts

@@ -1,4 +1,4 @@
-import type { AbortableAsyncMapper } from '..';
+import type { AbortableAsyncMapper, CommonLogger } from '..';
 import { ErrorMode } from '..';
 export interface PMapOptions {
     /**
@@ -13,8 +13,14 @@ export interface PMapOptions {
      * When set to THROW_AGGREGATED, instead of stopping when a promise rejects, it will wait for all the promises to settle and then reject with an Aggregated error.
      *
      * When set to SUPPRESS - will ignore errors and return results from successful operations.
+     * When in SUPPRESS - errors are still logged via the `logger` (which defaults to console).
      */
     errorMode?: ErrorMode;
+    /**
+     * Default to `console`.
+     * Pass `null` to skip logging completely.
+     */
+    logger?: CommonLogger | null;
 }
 /**
  * Returns a `Promise` that is fulfilled when all promises in `input` and ones returned from `mapper` are fulfilled,

package/dist/promise/pMap.js

@@ -37,6 +37,7 @@ const __1 = require("..");
  * })();
  */
 async function pMap(iterable, mapper, opt = {}) {
+    const { logger = console } = opt;
     const ret = [];
     // const iterator = iterable[Symbol.iterator]()
     const items = [...iterable];
@@ -65,7 +66,10 @@ async function pMap(iterable, mapper, opt = {}) {
                 if (errorMode === __1.ErrorMode.THROW_AGGREGATED) {
                     errors.push(err);
                 }
-                // otherwise, suppress completely
+                else {
+                    // otherwise, suppress (but still log via logger)
+                    logger?.error(err);
+                }
             }
         }
         if (errors.length) {
@@ -87,6 +91,10 @@ async function pMap(iterable, mapper, opt = {}) {
             else if (errorMode === __1.ErrorMode.THROW_AGGREGATED) {
                 errors.push(r.reason);
             }
+            else {
+                // otherwise, suppress (but still log via logger)
+                logger?.error(r.reason);
+            }
         });
         if (errors.length) {
             throw new AggregateError(errors, `pMap resulted in ${errors.length} error(s)`);
@@ -133,6 +141,10 @@ async function pMap(iterable, mapper, opt = {}) {
                     if (errorMode === __1.ErrorMode.THROW_AGGREGATED) {
                         errors.push(err);
                     }
+                    else {
+                        // otherwise, suppress (but still log via logger)
+                        logger?.error(err);
+                    }
                     resolvingCount--;
                     next();
                 }

package/dist/types.d.ts

@@ -25,6 +25,9 @@ export interface CreatedUpdatedId extends CreatedUpdated {
 export type ObjectWithId = {
     id: string;
 };
+export type PartialObjectWithId = {
+    id?: string;
+};
 export interface AnyObjectWithId extends AnyObject, ObjectWithId {
 }
 /**
@@ -58,9 +61,9 @@ export type BaseDBEntity = {
      */
     updated?: UnixTimestampNumber;
 };
-export type Saved<T extends Partial<ObjectWithId>> = T extends AnyObject ? Omit<T, 'id' | 'created' | 'updated'> & SavedDBEntity : T;
-export type Unsaved<T extends Partial<ObjectWithId>> = T extends AnyObject ? Omit<T, 'id' | 'created' | 'updated'> & BaseDBEntity : T;
-export type UnsavedId<T extends Partial<ObjectWithId>> = Omit<T, 'id'> & {
+export type Saved<T extends PartialObjectWithId> = T extends AnyObject ? Omit<T, 'id' | 'created' | 'updated'> & SavedDBEntity : T;
+export type Unsaved<T extends PartialObjectWithId> = T extends AnyObject ? Omit<T, 'id' | 'created' | 'updated'> & BaseDBEntity : T;
+export type UnsavedId<T extends PartialObjectWithId> = Omit<T, 'id'> & {
     id?: T['id'];
 };
 /**

package/dist-esm/promise/pMap.js

@@ -34,6 +34,7 @@ import { END, ErrorMode, SKIP } from '..';
  * })();
  */
 export async function pMap(iterable, mapper, opt = {}) {
+    const { logger = console } = opt;
     const ret = [];
     // const iterator = iterable[Symbol.iterator]()
     const items = [...iterable];
@@ -62,7 +63,10 @@ export async function pMap(iterable, mapper, opt = {}) {
                 if (errorMode === ErrorMode.THROW_AGGREGATED) {
                     errors.push(err);
                 }
-                // otherwise, suppress completely
+                else {
+                    // otherwise, suppress (but still log via logger)
+                    logger === null || logger === void 0 ? void 0 : logger.error(err);
+                }
             }
         }
         if (errors.length) {
@@ -84,6 +88,10 @@ export async function pMap(iterable, mapper, opt = {}) {
             else if (errorMode === ErrorMode.THROW_AGGREGATED) {
                 errors.push(r.reason);
             }
+            else {
+                // otherwise, suppress (but still log via logger)
+                logger === null || logger === void 0 ? void 0 : logger.error(r.reason);
+            }
         });
         if (errors.length) {
             throw new AggregateError(errors, `pMap resulted in ${errors.length} error(s)`);
@@ -130,6 +138,10 @@ export async function pMap(iterable, mapper, opt = {}) {
                     if (errorMode === ErrorMode.THROW_AGGREGATED) {
                         errors.push(err);
                     }
+                    else {
+                        // otherwise, suppress (but still log via logger)
+                        logger === null || logger === void 0 ? void 0 : logger.error(err);
+                    }
                     resolvingCount--;
                     next();
                 }

package/package.json

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

package/src/promise/pMap.ts

@@ -7,7 +7,7 @@ Improvements:
 - Compatible with pProps (that had typings issues)
  */
 
-import type { AbortableAsyncMapper } from '..'
+import type { AbortableAsyncMapper, CommonLogger } from '..'
 import { END, ErrorMode, SKIP } from '..'
 
 export interface PMapOptions {
@@ -24,8 +24,15 @@ export interface PMapOptions {
    * When set to THROW_AGGREGATED, instead of stopping when a promise rejects, it will wait for all the promises to settle and then reject with an Aggregated error.
    *
    * When set to SUPPRESS - will ignore errors and return results from successful operations.
+   * When in SUPPRESS - errors are still logged via the `logger` (which defaults to console).
    */
   errorMode?: ErrorMode
+
+  /**
+   * Default to `console`.
+   * Pass `null` to skip logging completely.
+   */
+  logger?: CommonLogger | null
 }
 
 /**
@@ -59,6 +66,7 @@ export async function pMap<IN, OUT>(
   mapper: AbortableAsyncMapper<IN, OUT>,
   opt: PMapOptions = {},
 ): Promise<OUT[]> {
+  const { logger = console } = opt
   const ret: (OUT | typeof SKIP)[] = []
   // const iterator = iterable[Symbol.iterator]()
   const items = [...iterable]
@@ -86,8 +94,10 @@ export async function pMap<IN, OUT>(
         if (errorMode === ErrorMode.THROW_IMMEDIATELY) throw err
         if (errorMode === ErrorMode.THROW_AGGREGATED) {
           errors.push(err as Error)
+        } else {
+          // otherwise, suppress (but still log via logger)
+          logger?.error(err)
         }
-        // otherwise, suppress completely
       }
     }
 
@@ -110,6 +120,9 @@ export async function pMap<IN, OUT>(
         if (r.value !== SKIP && r.value !== END) ret.push(r.value)
       } else if (errorMode === ErrorMode.THROW_AGGREGATED) {
         errors.push(r.reason)
+      } else {
+        // otherwise, suppress (but still log via logger)
+        logger?.error(r.reason)
       }
     })
 
@@ -165,6 +178,9 @@ export async function pMap<IN, OUT>(
             } else {
               if (errorMode === ErrorMode.THROW_AGGREGATED) {
                 errors.push(err)
+              } else {
+                // otherwise, suppress (but still log via logger)
+                logger?.error(err)
               }
               resolvingCount--
               next()

package/src/typeFest.ts

@@ -17,9 +17,8 @@ export type Simplify<T> = { [KeyType in keyof T]: T[KeyType] }
  @link https://github.com/microsoft/TypeScript/issues/27024#issuecomment-421529650
  @link https://stackoverflow.com/questions/68961864/how-does-the-equals-work-in-typescript/68963796#68963796
  */
-export type IsEqual<T, U> = (<G>() => G extends T ? 1 : 2) extends <G>() => G extends U ? 1 : 2
-  ? true
-  : false
+export type IsEqual<T, U> =
+  (<G>() => G extends T ? 1 : 2) extends <G>() => G extends U ? 1 : 2 ? true : false
 
 /**
  * Filter out keys from an object.
@@ -27,11 +26,8 @@ export type IsEqual<T, U> = (<G>() => G extends T ? 1 : 2) extends <G>() => G ex
  * Returns `never` if `Key` extends `Exclude`.
  * Returns `Key` otherwise.
  */
-type Filter<KeyType, ExcludeType> = IsEqual<KeyType, ExcludeType> extends true
-  ? never
-  : KeyType extends ExcludeType
-    ? never
-    : KeyType
+type Filter<KeyType, ExcludeType> =
+  IsEqual<KeyType, ExcludeType> extends true ? never : KeyType extends ExcludeType ? never : KeyType
 
 /**
  Create a type from an object type without certain keys.

package/src/types.ts

@@ -34,6 +34,11 @@ export type ObjectWithId = {
   id: string
 }
 
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type PartialObjectWithId = {
+  id?: string
+}
+
 export interface AnyObjectWithId extends AnyObject, ObjectWithId {}
 
 /**
@@ -75,15 +80,15 @@ export type BaseDBEntity = {
   updated?: UnixTimestampNumber
 }
 
-export type Saved<T extends Partial<ObjectWithId>> = T extends AnyObject
+export type Saved<T extends PartialObjectWithId> = T extends AnyObject
   ? Omit<T, 'id' | 'created' | 'updated'> & SavedDBEntity
   : T
 
-export type Unsaved<T extends Partial<ObjectWithId>> = T extends AnyObject
+export type Unsaved<T extends PartialObjectWithId> = T extends AnyObject
   ? Omit<T, 'id' | 'created' | 'updated'> & BaseDBEntity
   : T
 
-export type UnsavedId<T extends Partial<ObjectWithId>> = Omit<T, 'id'> & {
+export type UnsavedId<T extends PartialObjectWithId> = Omit<T, 'id'> & {
   id?: T['id']
 }