@versori/run 0.2.0-alpha.9 → 0.2.0

package/script/src/observability/logging/ConsoleLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConsoleLogger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/ConsoleLogger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,+CAA+C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAmF/C;;GAEG;AACH,qBAAa,aAAc,YAAW,MAAM;IACxC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;IAEhB,KAAK,EAAE,QAAQ,CAAC;IAEhB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAEpB,KAAK,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IAOjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO9D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO7D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO9D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,aAAa;IAOvD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CAGlC"}
+{"version":3,"file":"ConsoleLogger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/ConsoleLogger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,+CAA+C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAqM/C;;GAEG;AACH,qBAAa,aAAc,YAAW,MAAM;IACxC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;IAEhB,KAAK,EAAE,QAAQ,CAAC;IAEhB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAEpB,KAAK,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IAOjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO9D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO7D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAC3E,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAsB9D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,aAAa;IAOvD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CAGlC"}

package/script/src/observability/logging/ConsoleLogger.js

@@ -25,41 +25,132 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsoleLogger = void 0;
 const log = __importStar(require("../../../deps/jsr.io/@std/log/0.224.14/mod.js"));
-function valueOfUnknown(obj, idx) {
-    switch (typeof obj) {
+function isObjectLiteral(obj) {
+    return Object.getPrototypeOf(obj) === Object.prototype;
+}
+function formatError(err) {
+    if (Symbol.toPrimitive in err) {
+        const toPrimitive = err[Symbol.toPrimitive];
+        if (typeof toPrimitive === 'function') {
+            return toPrimitive();
+        }
+    }
+    const ret = {
+        error: err.message,
+    };
+    if (err.cause) {
+        if (err.cause instanceof Error) {
+            ret.cause = formatError(err.cause);
+        }
+        else {
+            // potential place to Deno.inspect?
+            ret.cause = formatArg(err.cause);
+        }
+    }
+    if (err.stack) {
+        ret.stacktrace = err.stack;
+    }
+    return ret;
+}
+// deno-lint-ignore ban-types
+function formatFunction(fn) {
+    const str = fn.toString();
+    return {
+        [`<fn:${fn.name}>`]: str.length > 40 ? `${str.substring(0, 40)}...` : str,
+    };
+}
+function formatArg(arg, nested = false) {
+    switch (typeof arg) {
         case 'object':
-            if (obj instanceof Object) {
-                const valueOf = obj.valueOf();
-                if (typeof valueOf === 'object' && !Array.isArray(valueOf)) {
-                    return valueOf;
+            if (arg === null) {
+                return null;
+            }
+            if (Array.isArray(arg)) {
+                return arg.map((arg) => formatArg(arg));
+            }
+            if (arg instanceof Date) {
+                return arg.toISOString();
+            }
+            if (Symbol.toPrimitive in arg) {
+                const toPrimitive = arg[Symbol.toPrimitive];
+                if (typeof toPrimitive === 'function') {
+                    return toPrimitive();
+                }
+            }
+            if (arg instanceof Error) {
+                if (nested) {
+                    return formatError(arg);
                 }
-                return {
-                    [`arg${idx}`]: obj,
-                };
+                return arg;
             }
-            if (obj === null) {
-                return {
-                    [`arg${idx}`]: null,
-                };
+            if (isObjectLiteral(arg)) {
+                // object literal or directly created by `new Object()`, not subclasses of Object.
+                return Object.entries(arg).reduce((acc, [key, value]) => ({
+                    ...acc,
+                    [key]: formatArg(value, true),
+                }), {});
             }
-            return obj;
+            return Deno.inspect(arg);
         case 'undefined':
-            return {
-                [`arg${idx}`]: undefined,
-            };
+            return '<undefined>';
         case 'function':
-            return {
-                [`arg${idx}`]: obj.valueOf(),
-            };
+            return formatFunction(arg);
         default:
-            return {
-                [`arg${idx}`]: obj,
-            };
+            return arg;
+    }
+}
+function formatArgs(args) {
+    if (args.length === 0) {
+        return {};
+    }
+    if (args.length === 1) {
+        const formatted = formatArg(args[0]);
+        if (formatted instanceof Error) {
+            return formatError(formatted);
+        }
+        if (typeof formatted === 'object' && formatted !== null) {
+            return formatted;
+        }
+        return {
+            arg0: formatted,
+        };
+    }
+    const errors = [];
+    const others = [];
+    for (const arg of args) {
+        const formatted = formatArgs([arg]);
+        if (arg instanceof Error) {
+            // formatted isn't an instanceof Error after `formatArgs()`, so check original `arg`.
+            errors.push(formatted);
+        }
+        else {
+            others.push(formatted);
+        }
+    }
+    const othersMerged = others.length === 1
+        ? others[0]
+        : others.reduce((acc, value, idx) => ({
+            ...acc,
+            [`arg${idx}`]: value,
+        }), {});
+    if (errors.length === 1) {
+        return {
+            ...othersMerged,
+            // if there's only one error, we want to splat 'error', 'cause' and 'stacktrace' over
+            // all other merged fields.
+            ...errors[0],
+        };
     }
+    return {
+        ...othersMerged,
+        // array of errors.
+        errors: errors,
+    };
 }
 log.setup({
     handlers: {
         default: new log.ConsoleHandler('DEBUG', {
+            useColors: false,
             formatter: (record) => {
                 // log.formatters.jsonFormatter bugs me:
                 // - time is in unix milliseconds
@@ -72,12 +163,7 @@ log.setup({
                         time: record.datetime.toISOString(),
                         ...(record.loggerName ? { name: record.loggerName } : {}),
                         msg: record.msg,
-                        ...(Array.isArray(record.args)
-                            ? (record.args.reduce((acc, next, idx) => ({
-                                ...acc,
-                                ...(valueOfUnknown(next, idx)),
-                            }), {}))
-                            : {}),
+                        ...formatArgs(record.args),
                     });
                 }
                 catch (err) {
@@ -138,9 +224,17 @@ class ConsoleLogger {
             ...fields,
         });
     }
-    error(message, fields) {
+    error(message, fieldsOrError, fields) {
+        if (fieldsOrError instanceof Error) {
+            this.log.error(message, fieldsOrError, {
+                ...this.fields,
+                ...fields,
+            });
+            return;
+        }
         this.log.error(message, {
             ...this.fields,
+            ...fieldsOrError,
             ...fields,
         });
     }