trying to fix issues

deno.json

@@ -2,7 +2,7 @@
 	"name": "@disgruntleddevs/make-safe-func",
 	"description": "Finally be sure your function don't throw",
 	"license": "MIT",
-	"version": "0.0.5",
+	"version": "0.0.6",
 	"exports": "./src/index.ts",
 	"tasks": {
 		"dev": "deno run --watch main.ts"

src/index.ts

@@ -1,32 +1,37 @@
-import {type Result,ok,err} from "npm:neverthrow@8.0.0";
+// deno-lint-ignore-file no-explicit-any
+import { err, ok, type Result, ResultAsync } from "npm:neverthrow@8.0.0";
 
-
-type AnyFunction=(...args:any[])=>any;
+export type AnyFunction = (...args: any[]) => any;
 
 /**
-* Wraps a function that could possibly throw
-* and returns a new function that uses Result<T,E>
-* to ensure errors are handled
-* 
-* @template F the type of the function to wrap
-* @param fn The Function being wrapped
-* @returns A new function that returns a Result Type 
-*
-*
-**/
-export function makeSafeFunction<F extends AnyFunction>(fn:F):(...args:Parameters<F>)=>Result<ReturnType<F> extends Promise<infer R>?R:ReturnType<F>,Error>{
-	// @ts-ignore: still yet to figure this out but it works
-	return (...args:Parameters<F>)=>{
-		try{
-			const result=fn(...args);
-
-			if(result instanceof Promise){
-				return result.then((value)=>ok(value)).catch((error)=>err(error instanceof Error?error:new Error(String(error))));
+ * Wraps a function that could possibly throw
+ * and returns a new function that uses Result<T,E>
+ * to ensure errors are handled
+ *
+ * @template F the type of the function to wrap
+ * @param fn The Function being wrapped
+ * @returns A new function that returns a Result Type
+ *
+ *
+ **/
+export function makeSafeFunction<F extends AnyFunction>(
+	fn: F,
+): (
+	...args: Parameters<F>
+) => ReturnType<F> extends Promise<unknown>
+	? ResultAsync<Awaited<ReturnType<F>>, Error>
+	: Result<ReturnType<F>, Error> {
+	return ((...args: Parameters<F>) => {
+		try {
+			const result = fn(...args);
+			if (result instanceof Promise) {
+				return ResultAsync.fromPromise(result, (error) =>
+					error instanceof Error ? error : new Error(String(error)),
+				);
 			}
-
 			return ok(result);
-		}catch(error){
-			return err(error instanceof Error?error:new Error(String(error)))
+		} catch (error) {
+			return err(error instanceof Error ? error : new Error(String(error)));
 		}
-	}
+	}) as any;
 }

src/test.ts

@@ -0,0 +1,11 @@
+import { makeSafeFunction } from "./index.ts";
+
+const unsafeDivide = (a: number, b: number) => {
+	if (b === 0) throw new Error("Zero Division Error");
+	return a / b;
+};
+
+const safeDivide = makeSafeFunction(unsafeDivide);
+
+safeDivide(1, 2).match(console.log, console.error);
+safeDivide(1, 0).match(console.log, console.error);