From 0bb299910841e064153432fdc10b22e2c7a8a49d Mon Sep 17 00:00:00 2001
From: mantoci <matteo.antoci@lastminute.com>
Date: Fri, 17 Jun 2022 14:00:58 +0200
Subject: [PATCH] Changed tryCatch API

---
 src/either/either.utils.test.ts | 18 +++++-------------
 src/either/either.utils.ts      | 10 +++++-----
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/either/either.utils.test.ts b/src/either/either.utils.test.ts
index 4cf2a9b..b19ff14 100644
--- a/src/either/either.utils.test.ts
+++ b/src/either/either.utils.test.ts
@@ -7,25 +7,17 @@ describe('Either utils', () => {
 	describe('tryCatch', () => {
 		describe('when callback runs successfully', () => {
 			it('runs safely', () => {
-				expect(
-					tryCatch(
-						() => 5,
-						() => Error('some error')
-					)
-				).toBeRight(5)
+				expect(tryCatch(() => 5)).toBeRight(5)
 			})
 		})
 
 		describe('when callback throws', () => {
 			it('runs safely', () => {
 				expect(
-					tryCatch(
-						() => {
-							throw new Error('some error')
-						},
-						(it) => ({ data: it.message })
-					)
-				).toBeLeft({ data: 'some error' })
+					tryCatch(() => {
+						throw new Error('some error')
+					})
+				).toBeLeft(Error('some error'))
 			})
 		})
 	})
diff --git a/src/either/either.utils.ts b/src/either/either.utils.ts
index 23499ec..6b490ec 100644
--- a/src/either/either.utils.ts
+++ b/src/either/either.utils.ts
@@ -1,11 +1,11 @@
-import { leftOf, rightOf } from './either'
+import { left, right } from './either'
 import { Either, Left, Right } from '../types'
 
-export const tryCatch = <E, A>(tryFn: () => A | Either<E, A>, catchFn: (e: any) => E | Either<E, A>): Either<E, A> => {
+export const tryCatch = <A>(tryFn: () => A): Either<unknown, A> => {
 	try {
-		return rightOf(tryFn())
-	} catch (e: any) {
-		return leftOf(catchFn(e))
+		return right(tryFn())
+	} catch (e) {
+		return left(e)
 	}
 }