@zokugun/xtry 0.2.0 → 0.3.0

package/README.md

@@ -130,8 +130,10 @@ export function err<E>(error: E): Failure<E>;
 ### Try helpers
 
 ```typescript
-export function xtry<T, E>(func: () => Exclude<T, Promise<unknown>>, handler?: (error: E) => void): Result<T, E>;
-export function xatry<T, E>(func: (() => Exclude<T, Promise<unknown>>) | Promise<Exclude<T, Promise<unknown>>>, handler?: (error: E) => void): Promise<Result<T, E>>;
+export function xtry<T, E>(func: () => Exclude<T, Promise<unknown>>, handler?: (error: unknown) => void | E): Result<T, E>;
+export function xatry<T, E>(func: (() => Exclude<T, Promise<unknown>>) | Promise<Exclude<T, Promise<unknown>>>, handler?: (error: unknown) => void | E): Promise<Result<T, E>>;
+
+export function stringifyError(error: unknown): string;
 ```
 
 Both helpers:

package/lib/index.d.ts

@@ -1,3 +1,4 @@
 export * from './partial.js';
 export * from './result.js';
+export * from './stringify-error.js';
 export * from './try.js';

package/lib/index.js

@@ -1,3 +1,4 @@
 export * from './partial.js';
 export * from './result.js';
+export * from './stringify-error.js';
 export * from './try.js';

package/lib/stringify-error.d.ts

@@ -0,0 +1 @@
+export declare function stringifyError(error: unknown): string;

package/lib/stringify-error.js

@@ -0,0 +1,18 @@
+export function stringifyError(error) {
+    if (typeof error === 'string') {
+        return error;
+    }
+    if (error instanceof Error) {
+        return error.message ?? String(error);
+    }
+    try {
+        const json = JSON.stringify(error);
+        if (typeof json === 'string') {
+            return json;
+        }
+    }
+    catch {
+        // fallthrough
+    }
+    return String(error);
+}

package/lib/try.d.ts

@@ -1,3 +1,3 @@
 import { type Result } from './result.js';
-export declare function xtry<T, E>(func: () => Exclude<T, Promise<unknown>>, handler?: ((error: E) => void)): Result<T, E>;
-export declare function xatry<T, E>(func: (() => Exclude<T, Promise<unknown>>) | Promise<Exclude<T, Promise<unknown>>>, handler?: ((error: E) => void)): Promise<Result<T, E>>;
+export declare function xtry<T, E = unknown>(func: () => Exclude<T, Promise<unknown>>, handler?: (error: unknown) => E | undefined): E extends void ? Result<T, unknown> : Result<T, E>;
+export declare function xatry<T, E = unknown>(func: (() => Exclude<T, Promise<unknown>>) | Promise<Exclude<T, Promise<unknown>>>, handler?: (error: unknown) => E | undefined): Promise<E extends void ? Result<T, unknown> : Result<T, E>>;

package/lib/try.js

@@ -2,24 +2,36 @@ import { err, ok } from './result.js';
 export function xtry(func, handler) {
     try {
         const value = func();
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return ok(value);
     }
     catch (error) {
         if (handler) {
-            handler(error);
+            const newError = handler(error);
+            if (newError !== undefined) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+                return err(newError);
+            }
         }
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return err(error);
     }
 }
 export async function xatry(func, handler) {
     try {
         const value = await (func instanceof Promise ? func : Promise.resolve().then(func));
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return ok(value);
     }
     catch (error) {
         if (handler) {
-            handler(error);
+            const newError = handler(error);
+            if (newError !== undefined) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+                return err(newError);
+            }
         }
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return err(error);
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@zokugun/xtry",
 	"description": "simple try/catch wrapper returning Result",
-	"version": "0.2.0",
+	"version": "0.3.0",
 	"author": {
 		"name": "Baptiste Augrain",
 		"email": "daiyam@zokugun.org"