@travetto/log 4.0.0-rc.7 → 4.0.0-rc.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/log",
-  "version": "4.0.0-rc.7",
+  "version": "4.0.0-rc.8",
   "description": "Logging framework that integrates at the console.log level.",
   "keywords": [
     "typescript",
@@ -23,9 +23,9 @@
     "directory": "module/log"
   },
   "dependencies": {
-    "@travetto/config": "^4.0.0-rc.7",
-    "@travetto/di": "^4.0.0-rc.7",
-    "@travetto/terminal": "^4.0.0-rc.7"
+    "@travetto/config": "^4.0.0-rc.8",
+    "@travetto/di": "^4.0.0-rc.8",
+    "@travetto/terminal": "^4.0.0-rc.8"
   },
   "travetto": {
     "displayName": "Logging"

package/src/formatter/google.ts

@@ -11,16 +11,25 @@ import { LogFormatter, LogEvent } from '../types';
  */
 @Injectable()
 export class GoogleLogFormatter implements LogFormatter {
+  #inspectOptions = { colors: false, showHidden: false, depth: 5, breakLength: 200 };
+
   format({
     source: file, line, scope, level, message, timestamp, module, args,
     context: { method, path, statusCode, ...context } = {},
   }: LogEvent): string {
+    const final: unknown[] = [...args];
+    if (message) {
+      args.unshift(message);
+    }
+    if (Object.keys(context).length) {
+      args.push(context);
+    }
     return JSON.stringify({
       context,
       'logging.googleapis.com/sourceLocation': { file, line },
       'logging.googleapis.com/labels': { module, scope },
       severity: level,
-      message: util.format(message, ...args, ...Object.entries(context).map(([k, v]) => util.format('%s=%s', k, v))),
+      message: util.formatWithOptions(this.#inspectOptions, final),
       timestamp,
       ...(method ? {
         httpRequest: {

package/src/formatter/line.ts

@@ -48,6 +48,13 @@ export class LineLogFormatterConfig {
   @Ignore()
   timestamp?: 's' | 'ms';
 
+  @Ignore()
+  inspectOptions: {
+    breakLength: number;
+    depth: number;
+    colors: boolean;
+  };
+
   postConstruct(): void {
     this.time ??= (!this.plain ? 'ms' : undefined);
     this.plain ??= !StyleUtil.enabled;
@@ -58,10 +65,11 @@ export class LineLogFormatterConfig {
     if (this.time !== undefined && this.time === 'ms' || this.time === 's') {
       this.timestamp = this.time;
     }
-    Object.assign(util.inspect.defaultOptions, {
+    this.inspectOptions = {
+      colors: this.colorize !== false,
       breakLength: Math.max(util.inspect.defaultOptions.breakLength ?? 0, 100),
-      depth: Math.max(util.inspect.defaultOptions.depth ?? 0, 4)
-    });
+      depth: Math.max(util.inspect.defaultOptions.depth ?? 0, 5)
+    };
   }
 }
 
@@ -79,8 +87,8 @@ export class LineLogFormatter implements LogFormatter {
 
   pretty(ev: LogEvent, o: unknown): string {
     return util.inspect(o, {
+      ...this.opts.inspectOptions,
       showHidden: ev.level === 'debug',
-      colors: this.opts.colorize !== false,
     });
   }
 
@@ -125,14 +133,14 @@ export class LineLogFormatter implements LogFormatter {
       out.push(ev.message);
     }
 
-    if (ev.context && Object.keys(ev.context).length) {
-      out.push(this.pretty(ev, ev.context));
-    }
-
     if (ev.args && ev.args.length) {
       out.push(...ev.args.map(a => this.pretty(ev, a)));
     }
 
+    if (ev.context && Object.keys(ev.context).length) {
+      out.push(this.pretty(ev, ev.context));
+    }
+
     return out.join(' ');
   }
 }

package/src/service.ts

@@ -1,4 +1,4 @@
-import { ObjectUtil, ConsoleListener, ConsoleManager, ConsoleEvent } from '@travetto/base';
+import { ConsoleListener, ConsoleManager, ConsoleEvent } from '@travetto/base';
 import { AutoCreate, DependencyRegistry, Injectable } from '@travetto/di';
 
 import { LogDecorator, LogEvent, Logger } from './types';
@@ -37,18 +37,22 @@ export class LogService implements ConsoleListener, AutoCreate {
    * Endpoint for listening, endpoint registered with ConsoleManager
    */
   onLog(ev: ConsoleEvent): void {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, prefer-const
-    let [message, context, ...args] = ev.args as [string | undefined, Record<string, unknown>, ...unknown[]];
-    if (!ObjectUtil.isPlainObject(context)) {
-      if (context !== undefined) {
-        args.unshift(context);
-      }
-      context = {};
+    const args = [...ev.args];
+    let context: Record<string, unknown> | undefined;
+    let message: string | undefined;
+    if (typeof args[0] === 'string') {
+      message = args[0];
+      args.shift(); // First arg is now the message
     }
 
-    if (typeof message !== 'string' && message !== undefined) {
-      args.unshift(message);
-      message = undefined;
+    // More flexible on context
+    const last = args[args.length - 1];
+    if (last !== null && last !== undefined && typeof last === 'object') {
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      context = Object.fromEntries(
+        Object.entries(last).filter(x => typeof x[1] !== 'function')
+      );
+      args.pop();
     }
 
     // Allow for controlled order of event properties