@naturalcycles/js-lib 15.89.0 → 15.90.0

package/dist/log/commonLogger.d.ts

@@ -52,8 +52,14 @@ export declare function commonLoggerPipe(loggers: CommonLogger[]): CommonLogger;
  */
 export declare function commonLoggerPrefix(logger: CommonLogger, ...prefixes: any[]): CommonLogger;
 export type CommonLogSink = CommonLogger | CommonLogWithLevelFunction;
+/**
+ * A plain object is copied once, at creation.
+ * A function is called on every log call, for context that changes after the logger is created
+ * (e.g a request context whose user is resolved later).
+ */
+export type CommonLogContext = AnyObject | (() => AnyObject);
 export interface CommonLoggerWithContext extends CommonLogger {
-    child: (context: AnyObject) => CommonLoggerWithContext;
+    child: (context: CommonLogContext) => CommonLoggerWithContext;
 }
 /**
  * Creates a CommonLogger from a single function that takes `level` and `args`.
@@ -62,4 +68,4 @@ export interface CommonLoggerWithContext extends CommonLogger {
  * the rest joined into `msg`.
  */
 export declare function commonLoggerCreate(sink: CommonLogSink): CommonLogger;
-export declare function commonLoggerCreate(sink: CommonLogSink, context: AnyObject): CommonLoggerWithContext;
+export declare function commonLoggerCreate(sink: CommonLogSink, context: CommonLogContext): CommonLoggerWithContext;

package/dist/log/commonLogger.js

@@ -83,16 +83,26 @@ export function commonLoggerCreate(sink, context) {
             error: (...args) => fn('error', args),
         };
     }
-    const ctx = { ...context };
+    const getContext = contextGetter(context);
     const logger = {
-        debug: (...args) => fn('debug', [toLogEntry(ctx, args)]),
-        log: (...args) => fn('log', [toLogEntry(ctx, args)]),
-        warn: (...args) => fn('warn', [toLogEntry(ctx, args)]),
-        error: (...args) => fn('error', [toLogEntry(ctx, args)]),
-        child: c => commonLoggerCreate(fn, { ...ctx, ...c }),
+        debug: (...args) => fn('debug', [toLogEntry(getContext(), args)]),
+        log: (...args) => fn('log', [toLogEntry(getContext(), args)]),
+        warn: (...args) => fn('warn', [toLogEntry(getContext(), args)]),
+        error: (...args) => fn('error', [toLogEntry(getContext(), args)]),
+        child: c => {
+            const getChild = contextGetter(c);
+            return commonLoggerCreate(fn, () => ({ ...getContext(), ...getChild() }));
+        },
     };
     return logger;
 }
+function contextGetter(context) {
+    // AnyObject also admits functions, so typeof does not narrow the union
+    if (typeof context === 'function')
+        return context;
+    const copy = { ...context };
+    return () => copy;
+}
 function toLogEntry(context, args) {
     const entry = { ...context };
     let err;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/js-lib",
   "type": "module",
-  "version": "15.89.0",
+  "version": "15.90.0",
   "dependencies": {
     "tslib": "^2"
   },

package/src/log/commonLogger.ts

@@ -128,8 +128,15 @@ export function commonLoggerPrefix(logger: CommonLogger, ...prefixes: any[]): Co
 
 export type CommonLogSink = CommonLogger | CommonLogWithLevelFunction
 
+/**
+ * A plain object is copied once, at creation.
+ * A function is called on every log call, for context that changes after the logger is created
+ * (e.g a request context whose user is resolved later).
+ */
+export type CommonLogContext = AnyObject | (() => AnyObject)
+
 export interface CommonLoggerWithContext extends CommonLogger {
-  child: (context: AnyObject) => CommonLoggerWithContext
+  child: (context: CommonLogContext) => CommonLoggerWithContext
 }
 
 /**
@@ -139,8 +146,11 @@ export interface CommonLoggerWithContext extends CommonLogger {
  * the rest joined into `msg`.
  */
 export function commonLoggerCreate(sink: CommonLogSink): CommonLogger
-export function commonLoggerCreate(sink: CommonLogSink, context: AnyObject): CommonLoggerWithContext
-export function commonLoggerCreate(sink: CommonLogSink, context?: AnyObject): CommonLogger {
+export function commonLoggerCreate(
+  sink: CommonLogSink,
+  context: CommonLogContext,
+): CommonLoggerWithContext
+export function commonLoggerCreate(sink: CommonLogSink, context?: CommonLogContext): CommonLogger {
   const fn: CommonLogWithLevelFunction =
     typeof sink === 'function' ? sink : (level, args) => sink[level](...args)
 
@@ -153,18 +163,28 @@ export function commonLoggerCreate(sink: CommonLogSink, context?: AnyObject): Co
     }
   }
 
-  const ctx: AnyObject = { ...context }
+  const getContext = contextGetter(context)
 
   const logger: CommonLoggerWithContext = {
-    debug: (...args) => fn('debug', [toLogEntry(ctx, args)]),
-    log: (...args) => fn('log', [toLogEntry(ctx, args)]),
-    warn: (...args) => fn('warn', [toLogEntry(ctx, args)]),
-    error: (...args) => fn('error', [toLogEntry(ctx, args)]),
-    child: c => commonLoggerCreate(fn, { ...ctx, ...c }),
+    debug: (...args) => fn('debug', [toLogEntry(getContext(), args)]),
+    log: (...args) => fn('log', [toLogEntry(getContext(), args)]),
+    warn: (...args) => fn('warn', [toLogEntry(getContext(), args)]),
+    error: (...args) => fn('error', [toLogEntry(getContext(), args)]),
+    child: c => {
+      const getChild = contextGetter(c)
+      return commonLoggerCreate(fn, () => ({ ...getContext(), ...getChild() }))
+    },
   }
   return logger
 }
 
+function contextGetter(context: CommonLogContext): () => AnyObject {
+  // AnyObject also admits functions, so typeof does not narrow the union
+  if (typeof context === 'function') return context as () => AnyObject
+  const copy = { ...context }
+  return () => copy
+}
+
 function toLogEntry(context: AnyObject, args: any[]): AnyObject {
   const entry: AnyObject = { ...context }
   let err: Error | undefined