@naturalcycles/js-lib 15.90.0 → 15.91.0

package/dist/promise/pMap.js

@@ -1,4 +1,5 @@
 import { ErrorMode } from '../error/errorMode.js';
+import { consoleLogger } from '../log/commonLogger.js';
 import { END, SKIP } from '../types.js';
 /**
  * Forked from https://github.com/sindresorhus/p-map
@@ -39,7 +40,7 @@ export async function pMap(iterable, mapper, opt = {}) {
     const itemsLength = items.length;
     if (itemsLength === 0)
         return []; // short circuit
-    const { concurrency = Infinity, errorMode = ErrorMode.THROW_IMMEDIATELY, logger = console } = opt;
+    const { concurrency = Infinity, errorMode = ErrorMode.THROW_IMMEDIATELY, logger = consoleLogger, } = opt;
     // Special cases that are able to preserve async stack traces
     // Special case: serial execution
     if (concurrency === 1) {
@@ -135,7 +136,7 @@ async function pMap1(items, mapper, errorMode, logger) {
             }
             else {
                 // otherwise, suppress (but still log via logger)
-                logger?.error(err);
+                logger?.error({ err });
             }
         }
     }
@@ -165,7 +166,7 @@ async function pMapAll(items, mapper, errorMode, logger) {
         }
         else {
             // otherwise, suppress (but still log via logger)
-            logger?.error(r.reason);
+            logger?.error({ err: r.reason });
         }
     }
     if (errors.length) {

package/dist/promise/pQueue.d.ts

@@ -12,7 +12,7 @@ export interface PQueueCfg {
      */
     errorMode?: ErrorMode;
     /**
-     * Default to `console`
+     * Default to `consoleLogger`
      */
     logger?: CommonLogger;
     /**

package/dist/promise/pRetry.d.ts

@@ -67,7 +67,7 @@ export interface PRetryOptions {
      */
     logNone?: boolean;
     /**
-     * Default to `console`
+     * Default to `consoleLogger`
      */
     logger?: CommonLogger;
     /**

package/dist/promise/pRetry.js

@@ -1,5 +1,6 @@
 import { _since } from '../datetime/time.util.js';
 import { _errorDataAppend } from '../error/error.util.js';
+import { consoleLogger } from '../log/commonLogger.js';
 import { pDelay } from './pDelay.js';
 import { pTimeout } from './pTimeout.js';
 /**
@@ -12,7 +13,7 @@ export function pRetryFn(fn, opt = {}) {
     };
 }
 export async function pRetry(fn, opt = {}) {
-    const { maxAttempts = 4, delay: initialDelay = 1000, delayMultiplier = 2, predicate, logger = console, name, timeout, } = opt;
+    const { maxAttempts = 4, delay: initialDelay = 1000, delayMultiplier = 2, predicate, logger = consoleLogger, name, timeout, } = opt;
     const fakeError = timeout ? new Error('TimeoutError') : undefined;
     let { logFirstAttempt = false, logRetries = true, logFailures = true, logSuccess = false } = opt;
     if (opt.logAll) {
@@ -52,7 +53,7 @@ export async function pRetry(fn, opt = {}) {
             if (logFailures) {
                 // Logger at warn (not error) level, because it's not a fatal error, but a retriable one
                 // Fatal one is not logged either, because it's been thrown instead
-                logger.warn(`${fname} attempt #${attempt} error in ${_since(started)}:`, err);
+                logger.warn({ msg: `${fname} attempt #${attempt} error in ${_since(started)}`, err });
             }
             if (attempt >= maxAttempts || (predicate && !predicate(err, attempt, maxAttempts))) {
                 // Give up

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/js-lib",
   "type": "module",
-  "version": "15.90.0",
+  "version": "15.91.0",
   "dependencies": {
     "tslib": "^2"
   },
@@ -14,7 +14,7 @@
     }
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "0.0.0",
+    "@naturalcycles/dev-lib": "20.64.0",
     "@types/node": "^26",
     "@types/semver": "^7",
     "typescript": "^7",

package/src/asyncManager.ts

@@ -1,8 +1,9 @@
+import { consoleLogger } from './log/commonLogger.js'
 import type { CommonLogger } from './log/commonLogger.js'
 import type { NumberOfMilliseconds } from './types.js'
 
 class AsyncManagerImpl {
-  logger: CommonLogger = console
+  logger: CommonLogger = consoleLogger
 
   pendingOps = new Set<Promise<unknown>>()
 
@@ -58,7 +59,7 @@ class AsyncManagerImpl {
     if (this.onErrorHooks.length) {
       this.onErrorHooks.forEach(hook => hook(err))
     } else {
-      this.logger.error('AsyncManager unhandled rejection:', err)
+      this.logger.error({ msg: 'AsyncManager unhandled rejection', err })
     }
   }
 }

package/src/decorators/asyncMemo.decorator.ts

@@ -1,4 +1,5 @@
 import { _assert, _assertTypeOf } from '../error/assert.js'
+import { consoleLogger } from '../log/commonLogger.js'
 import type { CommonLogger } from '../log/commonLogger.js'
 import type { AnyAsyncFunction, AnyFunction, AnyObject, MaybeParameters } from '../types.js'
 import { _objectAssign, MISS } from '../types.js'
@@ -20,7 +21,7 @@ export interface AsyncMemoOptions<FN> {
   cacheKeyFn?: (args: MaybeParameters<FN>) => any
 
   /**
-   * Default to `console`
+   * Default to `consoleLogger`
    */
   logger?: CommonLogger
 }
@@ -64,7 +65,7 @@ export const _AsyncMemo =
     // After it's resolved - it's evicted from the cache and moved to the "proper" `instanceCache`
     const instancePromiseCache = new Map<AnyObject, Map<any, Promise<any>>>()
 
-    const { logger = console, cacheFactory, cacheKeyFn = jsonMemoSerializer } = opt
+    const { logger = consoleLogger, cacheFactory, cacheKeyFn = jsonMemoSerializer } = opt
 
     const keyStr = String(key)
     const methodSignature = _getTargetMethodSignature(target, keyStr)
@@ -109,7 +110,7 @@ export const _AsyncMemo =
         },
         async err => {
           // Log the cache error and proceed "as cache Miss"
-          logger.error(err)
+          logger.error({ err })
           return await onMiss()
         },
       )
@@ -130,7 +131,7 @@ export const _AsyncMemo =
             try {
               await cache!.set(cacheKey, value)
             } catch (err) {
-              logger.error(err) // log and ignore the error
+              logger.error({ err }) // log and ignore the error
             } finally {
               // Clear the "in-flight" promise cache entry, as we now have a "permanent" cache entry
               promiseCache!.delete(cacheKey)

package/src/decorators/logMethod.decorator.ts

@@ -1,5 +1,6 @@
 import { _ms } from '../datetime/time.util.js'
 import { _assert } from '../error/assert.js'
+import { consoleLogger } from '../log/commonLogger.js'
 import type { CommonLogger } from '../log/commonLogger.js'
 import { SimpleMovingAverage } from '../math/sma.js'
 import { _stringify } from '../string/stringify.js'
@@ -53,7 +54,7 @@ export interface LogMethodOptions {
   logResultFn?: LogResultFn
 
   /**
-   * Defaults to `console`
+   * Defaults to `consoleLogger`
    */
   logger?: CommonLogger
 }
@@ -84,7 +85,7 @@ export function _LogMethod(opt: LogMethodOptions = {}): MethodDecorator {
       logStart,
       logResult,
       logResultLength = true,
-      logger = console,
+      logger = consoleLogger,
     } = opt
     let { logResultFn } = opt
     if (!logResultFn) {
@@ -156,10 +157,14 @@ function logFinished(
   }
 
   if (err !== undefined) {
-    t.push('ERROR:', err)
+    t.push('ERROR:')
   } else if (logResultFn) {
     t.push(...logResultFn(res))
   }
 
-  logger.log(...t.filter(Boolean))
+  const msg = t
+    .filter(Boolean)
+    .map(part => _stringify(part))
+    .join(' ')
+  logger.log(err === undefined ? msg : { msg, err })
 }

package/src/decorators/memo.decorator.ts

@@ -1,4 +1,5 @@
 import { _assert, _assertTypeOf } from '../error/assert.js'
+import { consoleLogger } from '../log/commonLogger.js'
 import type { CommonLogger } from '../log/commonLogger.js'
 import type { AnyFunction, AnyObject, MaybeParameters } from '../types.js'
 import { _objectAssign } from '../types.js'
@@ -21,7 +22,7 @@ export interface MemoOptions<FN> {
   cacheKeyFn?: (args: MaybeParameters<FN>) => any
 
   /**
-   * Default to `console`
+   * Default to `consoleLogger`
    */
   logger?: CommonLogger
 }
@@ -78,7 +79,7 @@ export const _Memo =
     const instanceCache = new Map<AnyObject, MemoCache>()
 
     const {
-      logger = console,
+      logger = consoleLogger,
       cacheFactory = () => new MapMemoCache(),
       cacheKeyFn = jsonMemoSerializer,
     } = opt
@@ -107,7 +108,7 @@ export const _Memo =
       try {
         cache.set(cacheKey, value)
       } catch (err) {
-        logger.error(err)
+        logger.error({ err })
       }
 
       return value

package/src/decorators/memoSimple.decorator.ts

@@ -11,6 +11,7 @@ Otherwise resorts to JSON.stringify.
 Benchmark shows similar perf for ObjectCache and MapCache.
  */
 
+import { consoleLogger } from '../log/commonLogger.js'
 import type { CommonLogger } from '../log/commonLogger.js'
 import { _getTargetMethodSignature } from './decorator.util.js'
 import type { MemoCache } from './memo.util.js'
@@ -55,7 +56,7 @@ export const memoSimple =
    */
     const cache: MemoCache = new MapMemoCache()
 
-    const { logger = console } = opt
+    const { logger = consoleLogger } = opt
     const keyStr = String(key)
     const methodSignature = _getTargetMethodSignature(target, keyStr)
 

package/src/decorators/memoized.ts

@@ -1,3 +1,4 @@
+import { consoleLogger } from '../log/commonLogger.js'
 import type { AnyFunction, MaybeParameters } from '../types.js'
 import type { MemoOptions } from './memo.decorator.js'
 import type { MemoCache } from './memo.util.js'
@@ -17,7 +18,7 @@ export function _memoized<FN extends AnyFunction>(
   opt: MemoOptions<FN> = {},
 ): FN & MemoizedFunction {
   const {
-    logger = console,
+    logger = consoleLogger,
     cacheFactory = () => new MapMemoCache(),
     cacheKeyFn = jsonMemoSerializer,
   } = opt
@@ -37,7 +38,7 @@ export function _memoized<FN extends AnyFunction>(
     try {
       cache.set(cacheKey, value)
     } catch (err) {
-      logger.error(err)
+      logger.error({ err })
     }
 
     return value

package/src/decorators/memoizedAsync.ts

@@ -1,3 +1,4 @@
+import { consoleLogger } from '../log/commonLogger.js'
 import type { AnyAsyncFunction, MaybeParameters } from '../types.js'
 import { MISS } from '../types.js'
 import type { AsyncMemoOptions } from './asyncMemo.decorator.js'
@@ -12,7 +13,7 @@ export function _memoizedAsync<FN extends AnyAsyncFunction>(
   fn: FN,
   opt: AsyncMemoOptions<FN>,
 ): FN & MemoizedAsyncFunction {
-  const { logger = console, cacheFactory, cacheKeyFn = jsonMemoSerializer } = opt
+  const { logger = consoleLogger, cacheFactory, cacheKeyFn = jsonMemoSerializer } = opt
 
   const cache = cacheFactory()
 
@@ -24,7 +25,7 @@ export function _memoizedAsync<FN extends AnyAsyncFunction>(
     try {
       value = await cache.get(cacheKey)
     } catch (err) {
-      logger.error(err)
+      logger.error({ err })
     }
 
     if (value !== MISS) {
@@ -37,7 +38,7 @@ export function _memoizedAsync<FN extends AnyAsyncFunction>(
       try {
         await cache.set(cacheKey, value)
       } catch (err) {
-        logger.error(err)
+        logger.error({ err })
       }
     })()
 

package/src/error/tryCatch.ts

@@ -1,4 +1,5 @@
 import { _since } from '../datetime/time.util.js'
+import { consoleLogger } from '../log/commonLogger.js'
 import type { CommonLogger } from '../log/commonLogger.js'
 import type { AnyFunction, UnixTimestampMillis } from '../types.js'
 import { _anyToError } from './error.util.js'
@@ -21,7 +22,7 @@ export interface TryCatchOptions {
   logError?: boolean
 
   /**
-   * Default to `console`
+   * Default to `consoleLogger`
    */
   logger?: CommonLogger
 }
@@ -35,7 +36,7 @@ export interface TryCatchOptions {
  * @experimental
  */
 export function _tryCatch<T extends AnyFunction>(fn: T, opt: TryCatchOptions = {}): T {
-  const { onError, logError = true, logSuccess = false, logger = console } = opt
+  const { onError, logError = true, logSuccess = false, logger = consoleLogger } = opt
 
   const fname = fn.name || 'anonymous'
 
@@ -52,7 +53,7 @@ export function _tryCatch<T extends AnyFunction>(fn: T, opt: TryCatchOptions = {
       return r
     } catch (err) {
       if (logError) {
-        logger.warn(`tryCatch.${fname} error in ${_since(started)}:`, err)
+        logger.warn({ msg: `tryCatch.${fname} error in ${_since(started)}`, err })
       }
 
       if (onError) {

package/src/http/fetcher.model.ts

@@ -162,7 +162,7 @@ export interface FetcherCfg {
   logWithSearchParams?: boolean
 
   /**
-   * Defaults to `console`.
+   * Defaults to `consoleLogger`.
    */
   logger?: CommonLogger
 

package/src/http/fetcher.ts

@@ -16,6 +16,7 @@ import {
   HttpRequestError,
   UnexpectedPassError,
 } from '../error/error.util.js'
+import { consoleLogger } from '../log/commonLogger.js'
 import { _clamp } from '../number/number.util.js'
 import {
   _filterFalsyValues,
@@ -30,7 +31,6 @@ import { pDelaySignal } from '../promise/pDelay.js'
 import { pTimeout } from '../promise/pTimeout.js'
 import { _toUrlOrNull } from '../string/index.js'
 import { _jsonParse, _jsonParseIfPossible } from '../string/json.util.js'
-import { _stringify } from '../string/stringify.js'
 import type {
   AnyObject,
   ErrorDataTuple,
@@ -416,7 +416,7 @@ export class Fetcher {
             .join(' '),
         )
         if (req.logRequestBody && req.init.body) {
-          logger.log(req.init.body) // todo: check if we can _inspect it
+          logger.log({ body: req.init.body }) // todo: check if we can _inspect it
         }
       }
 
@@ -584,7 +584,7 @@ export class Fetcher {
       )
 
       if (req.logResponseBody && res.body !== undefined) {
-        logger.log(res.body)
+        logger.log({ body: res.body })
       }
     }
   }
@@ -688,8 +688,8 @@ export class Fetcher {
     // lastError = retryStatus.retryStopped
     // We need to log the response "anyway" if logResponse is true
     if (res.err && (!retryStatus.retryStopped || res.req.logResponse)) {
-      this.cfg.logger.error(
-        [
+      this.cfg.logger.error({
+        msg: [
           ' <<',
           res.fetchResponse?.status || 0,
           res.signature,
@@ -699,10 +699,9 @@ export class Fetcher {
           _since(res.req.started),
         ]
           .filter(Boolean)
-          .join(' ') + '\n',
-        // We're stringifying the error here, otherwise Sentry shows it as [object Object]
-        _stringify(res.err.cause || res.err),
-      )
+          .join(' '),
+        err: res.err.cause || res.err,
+      })
     }
 
     if (retryStatus.retryStopped) return
@@ -847,7 +846,7 @@ export class Fetcher {
   }
 
   private normalizeCfg(cfg: FetcherCfg & FetcherOptions): FetcherNormalizedCfg {
-    const { debug = false, logger = console } = cfg
+    const { debug = false, logger = consoleLogger } = cfg
 
     if (cfg.baseUrl?.endsWith('/')) {
       logger.warn(`Fetcher: baseUrl should not end with slash: ${cfg.baseUrl}`)