kerium 1.3.4 → 1.3.6

package/dist/error.d.ts

@@ -454,7 +454,7 @@ export declare class Exception extends Error implements NodeJS.ErrnoException, E
 export declare function UV(this: void, code: keyof typeof Errno, syscall: string, path?: string, dest?: string): Exception;
 export declare function UV(this: void, code: keyof typeof Errno, context?: ExceptionExtra): Exception;
 /**
- * Shortcut to easily create an `ErrnoException` with a specific error code.
+ * Shortcut to easily create an `Exception` with a specific error code.
  */
 export declare function withErrno(this: void, code: keyof typeof Errno, message?: string): Exception;
 export declare function rethrow(syscall: string, path?: string, dest?: string): (e: Exception) => never;

package/dist/error.js

@@ -415,7 +415,7 @@ export function setUVMessage(ex) {
         message += ` '${ex.path}'`;
     if (ex.dest)
         message += ` -> '${ex.dest}'`;
-    if (ex.message && ex.message !== errnoMessages[ex.errno])
+    if (ex.message && !ex.message.startsWith(errnoMessages[ex.errno]))
         message += ` (${ex.message})`;
     ex.message = message;
     return ex;
@@ -439,17 +439,12 @@ export class Exception extends Error {
     syscall;
     constructor(errno, message, ctx = {}) {
         const code = Errno[errno];
-        if (message === false) {
-            message = `${code}: ${errnoMessages[errno]}, ${ctx.syscall}`;
-            if (ctx.path)
-                message += ` '${ctx.path}'`;
-            if (ctx.dest)
-                message += ` -> '${ctx.dest}'`;
-        }
-        super(message);
+        super(message || '');
         this.errno = errno;
         this.code = code;
         Object.assign(this, omit(ctx, 'message'));
+        if (!message)
+            setUVMessage(this);
         Error.captureStackTrace?.(this, this.constructor);
     }
     toString() {
@@ -484,7 +479,7 @@ export function UV(code, context, path, dest) {
     return err;
 }
 /**
- * Shortcut to easily create an `ErrnoException` with a specific error code.
+ * Shortcut to easily create an `Exception` with a specific error code.
  */
 export function withErrno(code, message) {
     const err = new Exception(Errno[code], message ?? errnoMessages[Errno[code]]);

package/dist/log.js

@@ -87,16 +87,8 @@ export function deprecated(symbol) {
 function ansi(text, format) {
     return `\x1b[${format}m${text}\x1b[0m`;
 }
-function _prettyMs(entry, style) {
-    const text = '[' + (entry.elapsedMs / 1000).toFixed(3).padStart(10) + '] ';
-    switch (style) {
-        case 'ansi':
-            return [ansi(text, '2;37')];
-        case 'css':
-            return ['%c' + text, 'opacity: 0.8; color: white;'];
-        default:
-            return [text];
-    }
+function timestamp(entry) {
+    return '[' + (entry.elapsedMs / 1000).toFixed(3).padStart(10) + '] ';
 }
 const levelColor = {
     ansi: {
@@ -148,26 +140,26 @@ const messageColor = {
  */
 export function fancy({ style, colorize }) {
     return function* (entry) {
-        yield* _prettyMs(entry, style);
+        if (style == 'css')
+            yield colorize == 'level' ? '%c%s %c%s' : '%c%s %c%s%s %c%s';
+        yield* style == 'ansi' ? [ansi(timestamp(entry), '2;37')] : ['opacity: 0.8; color: white;', timestamp(entry)];
         const levelText = style == 'ansi'
             ? [ansi(levels[entry.level].toUpperCase(), levelColor.ansi[entry.level])]
-            : ['%c' + levels[entry.level].toUpperCase(), levelColor.css[entry.level]];
+            : [levelColor.css[entry.level], levels[entry.level].toUpperCase()];
         if (colorize == 'level') {
             yield* levelText;
             yield entry.message;
             return;
         }
-        if (entry.level < Level.CRIT) {
+        if (entry.level < Level.CRIT)
             yield* levelText;
-            yield ': ';
-        }
-        if (colorize == 'message')
+        if (style == 'ansi')
             yield ansi(entry.message, messageColor.ansi[entry.level]);
         else
-            yield* ['%c' + entry.message, messageColor.css[entry.level]];
+            yield* [messageColor.css[entry.level], entry.message];
     };
 }
-let _format = (entry) => [..._prettyMs(entry), entry.message];
+let _format = (entry) => [timestamp(entry), entry.message];
 export function format(entry) {
     const formatted = _format(entry);
     return typeof formatted == 'string' ? [formatted] : Array.from(formatted);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "kerium",
-	"version": "1.3.4",
+	"version": "1.3.6",
 	"description": "POSIX-style errors, logging, and more",
 	"author": "James Prevett <jp@jamespre.dev> (https://jamespre.dev)",
 	"repository": {