@drunkcod/express-kit 0.0.14 → 0.0.16

package/lib/cjs/loggable.d.ts

@@ -1,5 +1,11 @@
 export declare function at(message?: string): string;
-export declare function asLoggableError(error: unknown): object;
+type LoggableCause = {
+    message: unknown;
+    cause?: unknown;
+    stack?: string;
+};
+export declare function asLoggableError(error: unknown): LoggableCause;
 export declare function hasOwnJSON(x: object): x is {
     toJSON(): unknown;
 };
+export {};

package/lib/cjs/loggable.js

@@ -17,27 +17,41 @@ function at(message) {
         Error.stackTraceLimit = old;
     }
 }
+function loggableStack(message, stopAt) {
+    const s = {};
+    Error.captureStackTrace(s, asLoggableError);
+    if (message)
+        message = `: ${message}`;
+    else
+        message = '';
+    return `LoggableError${message}\n` + s.stack?.substring(6);
+}
 function asLoggableCause(cause) {
-    if (cause == null || typeof cause !== 'object')
-        return cause;
+    if (cause == null)
+        return null;
+    if (typeof cause !== 'object')
+        return { message: cause };
     if (hasOwnJSON(cause))
         return asLoggableCause(cause.toJSON());
-    if (cause instanceof Error) {
+    if (cause instanceof Error || (0, argis_1.hasOwn)(cause, 'cause')) {
         const { message, stack, cause: innerCause, ...rest } = cause;
-        return innerCause ? { message, stack, cause: asLoggableCause(innerCause), ...rest } : { message, stack, ...rest };
-    }
-    if ((0, argis_1.hasOwn)(cause, 'cause')) {
-        const { cause: innerCause, ...rest } = cause;
-        return { ...rest, cause: asLoggableCause(innerCause) };
+        const r = { message };
+        if (innerCause) {
+            const loggableInner = asLoggableCause(innerCause);
+            r.cause = loggableInner;
+            r.message ??= loggableInner.message;
+        }
+        if (stack)
+            r.stack = stack;
+        return Object.assign(r, rest);
     }
-    return { ...cause };
+    return { message: cause.toString(), ...cause };
 }
 function asLoggableError(error) {
     if (error instanceof Error)
         return asLoggableCause(error);
-    const r = error && typeof error === 'object' ? asLoggableCause(error) : { message: error };
-    Error.captureStackTrace(r, asLoggableError);
-    return Object.defineProperty(r, 'stack', { enumerable: true });
+    const { message, ...rest } = error && typeof error === 'object' ? asLoggableCause(error) : { message: error };
+    return { message, stack: loggableStack(message?.toString(), asLoggableError), ...rest };
 }
 function hasOwnJSON(x) {
     return 'toJSON' in x && typeof x.toJSON === 'function';

package/lib/loggable.d.ts

@@ -1,5 +1,11 @@
 export declare function at(message?: string): string;
-export declare function asLoggableError(error: unknown): object;
+type LoggableCause = {
+    message: unknown;
+    cause?: unknown;
+    stack?: string;
+};
+export declare function asLoggableError(error: unknown): LoggableCause;
 export declare function hasOwnJSON(x: object): x is {
     toJSON(): unknown;
 };
+export {};

package/lib/loggable.js

@@ -12,27 +12,41 @@ export function at(message) {
         Error.stackTraceLimit = old;
     }
 }
+function loggableStack(message, stopAt) {
+    const s = {};
+    Error.captureStackTrace(s, asLoggableError);
+    if (message)
+        message = `: ${message}`;
+    else
+        message = '';
+    return `LoggableError${message}\n` + s.stack?.substring(6);
+}
 function asLoggableCause(cause) {
-    if (cause == null || typeof cause !== 'object')
-        return cause;
+    if (cause == null)
+        return null;
+    if (typeof cause !== 'object')
+        return { message: cause };
     if (hasOwnJSON(cause))
         return asLoggableCause(cause.toJSON());
-    if (cause instanceof Error) {
+    if (cause instanceof Error || hasOwn(cause, 'cause')) {
         const { message, stack, cause: innerCause, ...rest } = cause;
-        return innerCause ? { message, stack, cause: asLoggableCause(innerCause), ...rest } : { message, stack, ...rest };
-    }
-    if (hasOwn(cause, 'cause')) {
-        const { cause: innerCause, ...rest } = cause;
-        return { ...rest, cause: asLoggableCause(innerCause) };
+        const r = { message };
+        if (innerCause) {
+            const loggableInner = asLoggableCause(innerCause);
+            r.cause = loggableInner;
+            r.message ??= loggableInner.message;
+        }
+        if (stack)
+            r.stack = stack;
+        return Object.assign(r, rest);
     }
-    return { ...cause };
+    return { message: cause.toString(), ...cause };
 }
 export function asLoggableError(error) {
     if (error instanceof Error)
         return asLoggableCause(error);
-    const r = error && typeof error === 'object' ? asLoggableCause(error) : { message: error };
-    Error.captureStackTrace(r, asLoggableError);
-    return Object.defineProperty(r, 'stack', { enumerable: true });
+    const { message, ...rest } = error && typeof error === 'object' ? asLoggableCause(error) : { message: error };
+    return { message, stack: loggableStack(message?.toString(), asLoggableError), ...rest };
 }
 export function hasOwnJSON(x) {
     return 'toJSON' in x && typeof x.toJSON === 'function';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@drunkcod/express-kit",
   "type": "module",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "Express4 utility things",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -39,7 +39,7 @@
     "express-async"
   ],
   "dependencies": {
-    "@drunkcod/argis": "^0.0.7",
+    "@drunkcod/argis": "^0.0.11",
     "@drunkcod/express-async": "^0.0.13"
   },
   "devDependencies": {