@terrygonguet/utils 0.0.4 → 0.0.6

package/dist/functional.js

@@ -1,8 +1,8 @@
-var g = Object.defineProperty;
-var p = (t, e, r) => e in t ? g(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var f = (t, e, r) => (p(t, typeof e != "symbol" ? e + "" : e, r), r);
-const a = "@terrygonguet/utils/functional/maybe", _ = "@terrygonguet/utils/functional/maybe/Some", b = "@terrygonguet/utils/functional/maybe/None";
-function i(t) {
+var p = Object.defineProperty;
+var S = (t, e, r) => e in t ? p(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
+var f = (t, e, r) => (S(t, typeof e != "symbol" ? e + "" : e, r), r);
+const s = "@terrygonguet/utils/functional/maybe", _ = "@terrygonguet/utils/functional/maybe/Some", h = "@terrygonguet/utils/functional/maybe/None";
+function u(t) {
   return Object.create(
     {
       isSome: () => !0,
@@ -11,82 +11,88 @@ function i(t) {
         return this.value;
       },
       map(e) {
-        return i(e(this.value));
+        return u(e(this.value));
       },
       flatMap(e) {
         return e(this.value);
       },
       toJSON() {
-        return { $_kind: a, $_variant: _, value: this.value };
+        return { $_kind: s, $_variant: _, value: this.value };
       }
     },
     {
-      $_kind: { value: a, enumerable: !1, writable: !1 },
+      $_kind: { value: s, enumerable: !1, writable: !1 },
       $_variant: { value: _, enumerable: !1, writable: !1 },
       value: { value: t, writable: !1 }
     }
   );
 }
-const n = Object.create(
+const a = Object.create(
   {
     isSome: () => !1,
     isNone: () => !0,
     orDefault: $,
-    map: () => n,
-    flatMap: () => n,
-    toJSON: () => ({ $_kind: a, $_variant: b })
+    map: () => a,
+    flatMap: () => a,
+    toJSON: () => ({ $_kind: s, $_variant: h })
   },
   {
-    $_kind: { value: a, enumerable: !1, writable: !1 },
-    $_variant: { value: b, enumerable: !1, writable: !1 }
+    $_kind: { value: s, enumerable: !1, writable: !1 },
+    $_variant: { value: h, enumerable: !1, writable: !1 }
   }
-), k = {
-  Some: i,
-  None: n,
+), y = {
+  Some: u,
+  None: a,
   from(t) {
     switch (t) {
       case null:
       case void 0:
-        return n;
+        return a;
       default:
-        return i(t);
+        return u(t);
     }
   },
   JSONReviver(t, e) {
-    if ((e == null ? void 0 : e.$_kind) == a) {
+    if ((e == null ? void 0 : e.$_kind) == s) {
       const r = e == null ? void 0 : e.$_variant;
-      return r == _ ? i(e == null ? void 0 : e.value) : r == b ? n : e;
+      return r == _ ? u(e == null ? void 0 : e.value) : r == h ? a : e;
     } else
       return e;
   }
-}, s = "@terrygonguet/utils/functional/result", u = "@terrygonguet/utils/functional/result/Success", m = "@terrygonguet/utils/functional/result/Failure";
-function l(t) {
+}, i = "@terrygonguet/utils/functional/result", o = "@terrygonguet/utils/functional/result/Success", b = "@terrygonguet/utils/functional/result/Failure";
+function c(t) {
   return Object.create(
     {
       isSuccess: () => !0,
       isFailure: () => !1,
+      merge(e) {
+        return e(this.value);
+      },
       map(e) {
-        return l(e(this.value));
+        return c(e(this.value));
       },
       flatMap(e) {
         return e(this.value);
       },
       toJSON() {
-        return { $_kind: s, $_variant: u, value: this.value };
+        return { $_kind: i, $_variant: o, value: this.value };
       }
     },
     {
-      $_kind: { value: s, enumerable: !1, writable: !1 },
-      $_variant: { value: u, enumerable: !1, writable: !1 },
+      $_kind: { value: i, enumerable: !1, writable: !1 },
+      $_variant: { value: o, enumerable: !1, writable: !1 },
       value: { value: t, writable: !1 }
     }
   );
 }
-function h(t) {
+function m(t) {
   return Object.create(
     {
       isSuccess: () => !1,
       isFailure: () => !0,
+      merge(e, r) {
+        return r(this.reason);
+      },
       map() {
         return this;
       },
@@ -94,31 +100,31 @@ function h(t) {
         return this;
       },
       toJSON() {
-        return { $_kind: s, $_variant: m, reason: this.reason };
+        return { $_kind: i, $_variant: b, reason: this.reason };
       }
     },
     {
-      $_kind: { value: s, enumerable: !1, writable: !1 },
-      $_variant: { value: u, enumerable: !1, writable: !1 },
+      $_kind: { value: i, enumerable: !1, writable: !1 },
+      $_variant: { value: o, enumerable: !1, writable: !1 },
       reason: { value: t, writable: !1 }
     }
   );
 }
-const F = {
-  Success: l,
-  Failure: h,
+const v = {
+  Success: c,
+  Failure: m,
   try(t) {
-    return new S(t);
+    return new d(t);
   },
   JSONReviver(t, e) {
-    if ((e == null ? void 0 : e.$_kind) == s) {
+    if ((e == null ? void 0 : e.$_kind) == i) {
       const r = e == null ? void 0 : e.$_variant;
-      return r == u ? l(e == null ? void 0 : e.value) : r == m ? h(e == null ? void 0 : e.reason) : e;
+      return r == o ? c(e == null ? void 0 : e.value) : r == b ? m(e == null ? void 0 : e.reason) : e;
     } else
       return e;
   }
 };
-class S {
+class d {
   constructor(e) {
     f(this, "tryFn");
     f(this, "catchFn");
@@ -127,38 +133,35 @@ class S {
   catch(e) {
     return this.catchFn = e, this;
   }
-  exec() {
+  exec(e) {
     try {
-      return l(this.tryFn());
-    } catch (e) {
-      return h(this.catchFn(e));
+      const r = c(this.tryFn());
+      return e == null || e(r), r;
+    } catch (r) {
+      const n = m(this.catchFn(r));
+      return e == null || e(n), n;
     }
   }
 }
-var N = d;
-function d(t, e) {
+var N = w;
+function w(t, e) {
   if (!arguments.length)
     throw new Error(
       "expected at least one (and probably more) function arguments"
     );
   var r = arguments;
   return function() {
-    for (var o = r[0].apply(this, arguments), y = r.length, c = 1; c < y; c++)
-      o = r[c].call(this, o);
-    return o;
+    for (var n = r[0].apply(this, arguments), g = r.length, l = 1; l < g; l++)
+      n = r[l].call(this, n);
+    return n;
   };
 }
 function $(t) {
   return t;
 }
 export {
-  h as Failure,
-  k as Maybe,
-  n as None,
-  F as Result,
-  i as Some,
-  l as Success,
-  S as TryCatch,
+  y as Maybe,
+  v as Result,
   N as compose,
   $ as identity
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@terrygonguet/utils",
-	"version": "0.0.4",
+	"version": "0.0.6",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
@@ -9,6 +9,7 @@
 		"coverage": "vitest run --coverage"
 	},
 	"devDependencies": {
+		"@vitest/coverage-v8": "^0.32.0",
 		"@vitest/ui": "^0.32.0",
 		"prettier": "^2.8.8",
 		"typescript": "^5.0.2",

package/src/functional/maybe.ts

@@ -17,7 +17,7 @@ const $_kind = "@terrygonguet/utils/functional/maybe"
 const $_variant_Some = "@terrygonguet/utils/functional/maybe/Some"
 const $_variant_None = "@terrygonguet/utils/functional/maybe/None"
 
-export function Some<T>(value: NonNullable<T>): Some<T> {
+function Some<T>(value: NonNullable<T>): Some<T> {
 	return Object.create(
 		{
 			isSome: () => true,
@@ -43,7 +43,7 @@ export function Some<T>(value: NonNullable<T>): Some<T> {
 	)
 }
 
-export const None: None<any> = Object.create(
+const None: None<any> = Object.create(
 	{
 		isSome: () => false,
 		isNone: () => true,

package/src/functional/result.ts

@@ -3,6 +3,7 @@ import { identity } from "./index.ts"
 interface API<S, F> {
 	isSuccess(this: Result<S, F>): this is Success<S, F>
 	isFailure(this: Result<S, F>): this is Failure<S, F>
+	merge<T>(this: Result<S, F>, f: (value: S) => T, g: (reason: F) => T): T
 	map<S2>(this: Result<S, F>, f: (value: S) => S2): Result<S2, F>
 	flatMap<S2, F2>(this: Result<S, F>, f: (value: S) => Result<S2, F | F2>): Result<S2, F | F2>
 	toJSON(this: Result<S, F>): Object
@@ -16,11 +17,14 @@ const $_kind = "@terrygonguet/utils/functional/result"
 const $_variant_Success = "@terrygonguet/utils/functional/result/Success"
 const $_variant_Failure = "@terrygonguet/utils/functional/result/Failure"
 
-export function Success<S, F>(value: S): Success<S, F> {
+function Success<S, F>(value: S): Success<S, F> {
 	return Object.create(
 		{
 			isSuccess: () => true,
 			isFailure: () => false,
+			merge<T>(this: Success<S, F>, f: (value: S) => T) {
+				return f(this.value)
+			},
 			map<S2>(this: Success<S, F>, f: (value: S) => S2) {
 				return Success(f(this.value))
 			},
@@ -39,11 +43,14 @@ export function Success<S, F>(value: S): Success<S, F> {
 	)
 }
 
-export function Failure<S, F>(reason: F): Failure<S, F> {
+function Failure<S, F>(reason: F): Failure<S, F> {
 	return Object.create(
 		{
 			isSuccess: () => false,
 			isFailure: () => true,
+			merge<T>(this: Failure<S, F>, _: (value: S) => T, g: (reason: F) => T) {
+				return g(this.reason)
+			},
 			map<S2>(this: Failure<S, F>) {
 				return this as unknown as Result<S2, F>
 			},
@@ -78,7 +85,7 @@ export const Result = {
 	},
 }
 
-export class TryCatch<S, F> {
+class TryCatch<S, F> {
 	tryFn: () => S
 	catchFn: (err: unknown) => F
 
@@ -92,11 +99,15 @@ export class TryCatch<S, F> {
 		return this
 	}
 
-	exec(): Result<S, F> {
+	exec(finallyFn?: (result: Result<S, F>) => void): Result<S, F> {
 		try {
-			return Success<S, F>(this.tryFn())
+			const result = Success<S, F>(this.tryFn())
+			finallyFn?.(result)
+			return result
 		} catch (error) {
-			return Failure<S, F>(this.catchFn(error))
+			const result = Failure<S, F>(this.catchFn(error))
+			finallyFn?.(result)
+			return result
 		}
 	}
 }

package/types/functional/maybe.d.ts

@@ -11,8 +11,7 @@ export type Some<T> = {
 } & API<T>;
 export type None<T> = API<T>;
 export type Maybe<T> = Some<T> | None<T>;
-export declare function Some<T>(value: NonNullable<T>): Some<T>;
-export declare const None: None<any>;
+declare function Some<T>(value: NonNullable<T>): Some<T>;
 export declare const Maybe: {
     Some: typeof Some;
     None: None<any>;

package/types/functional/result.d.ts

@@ -1,6 +1,7 @@
 interface API<S, F> {
     isSuccess(this: Result<S, F>): this is Success<S, F>;
     isFailure(this: Result<S, F>): this is Failure<S, F>;
+    merge<T>(this: Result<S, F>, f: (value: S) => T, g: (reason: F) => T): T;
     map<S2>(this: Result<S, F>, f: (value: S) => S2): Result<S2, F>;
     flatMap<S2, F2>(this: Result<S, F>, f: (value: S) => Result<S2, F | F2>): Result<S2, F | F2>;
     toJSON(this: Result<S, F>): Object;
@@ -12,19 +13,19 @@ export type Failure<S, F> = {
     reason: F;
 } & API<S, F>;
 export type Result<S, F> = Success<S, F> | Failure<S, F>;
-export declare function Success<S, F>(value: S): Success<S, F>;
-export declare function Failure<S, F>(reason: F): Failure<S, F>;
+declare function Success<S, F>(value: S): Success<S, F>;
+declare function Failure<S, F>(reason: F): Failure<S, F>;
 export declare const Result: {
     Success: typeof Success;
     Failure: typeof Failure;
     try<S, F>(tryFn: () => S): TryCatch<S, F>;
     JSONReviver(_key: string, value: any): any;
 };
-export declare class TryCatch<S, F> {
+declare class TryCatch<S, F> {
     tryFn: () => S;
     catchFn: (err: unknown) => F;
     constructor(tryFn: () => S);
     catch(catchFn: (err: unknown) => F): this;
-    exec(): Result<S, F>;
+    exec(finallyFn?: (result: Result<S, F>) => void): Result<S, F>;
 }
 export {};