Merge branch 'main' of github.com:bkiac/patina

package.json

@@ -1,8 +1,8 @@
 {
-	"name": "patina",
+	"name": "@patina/std",
 	"version": "0.1.0",
 	"type": "module",
-	"description": "Type-safe error-handling library for TypeScript",
+	"description": "Type-safe nothing-handling and error-handling library",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/bkiac/patina.git"

scripts/benchmark.ts

@@ -9,14 +9,14 @@ function formatTime(ms: number) {
 
 const a = asyncFn(async () => {
 	const one = await getOne();
-	if (one.isErr) {
+	if (one.isErr()) {
 		return one;
 	}
 	const rand = Math.random();
 	if (Math.random() < 0.5) {
 		return Err("error");
 	}
-	return Ok(rand + one.value);
+	return Ok(rand + one.value());
 });
 
 const b = asyncGenFn(async function* () {

src/async_option.ts

@@ -1,5 +1,5 @@
 import {AsyncResult} from ".";
-import type {Option, OptionMatch} from "./option";
+import type {Option, OptionMatch, OptionMatchAsync} from "./option";
 
 /**
  * A promise that resolves to an `Option`.
@@ -33,6 +33,24 @@ export class AsyncOption<T> implements PromiseLike<Option<T>> {
 		);
 	}
 
+	/**
+	 * Async version of `Option#match`.
+	 */
+	async match<A, B>(matcher: OptionMatch<T, A, B>): Promise<A | B> {
+		return (await this).match(matcher);
+	}
+
+	async matchAsync<A, B>(matcher: OptionMatchAsync<T, A, B>): Promise<A | B> {
+		return (await this).matchAsync(matcher);
+	}
+
+	/**
+	 * Async version of `Option#value`.
+	 */
+	async value(): Promise<T | undefined> {
+		return (await this).value();
+	}
+
 	/**
 	 * Async version of `Option#okOr`.
 	 */
@@ -157,11 +175,4 @@ export class AsyncOption<T> implements PromiseLike<Option<T>> {
 			this.then((thisOption) => other.then((otherOption) => thisOption.xor(otherOption))),
 		);
 	}
-
-	/**
-	 * Async version of `Option#match`.
-	 */
-	async match<A, B>(matcher: OptionMatch<T, A, B>): Promise<A | B> {
-		return (await this).match(matcher);
-	}
 }

src/async_result.ts

@@ -1,5 +1,5 @@
 import {AsyncOption} from "./async_option";
-import type {Result, ResultImpl, ResultMatch} from "./result";
+import type {Result, ResultImpl, ResultMatch, ResultMatchAsync} from "./result";
 
 /**
  * A promise that resolves to a `Result`.
@@ -39,6 +39,25 @@ export class AsyncResult<T, E> implements PromiseLike<Result<T, E>> {
 		);
 	}
 
+	/**
+	 * Async version of `Result#match`.
+	 */
+	async match<A, B>(matcher: ResultMatch<T, E, A, B>): Promise<A | B> {
+		return (await this).match(matcher);
+	}
+
+	async matchAsync<A, B>(matcher: ResultMatchAsync<T, E, A, B>): Promise<A | B> {
+		return (await this).matchAsync(matcher);
+	}
+
+	async value(): Promise<T | undefined> {
+		return (await this).value();
+	}
+
+	async error(): Promise<E | undefined> {
+		return (await this).error();
+	}
+
 	/**
 	 * Async version of `Result#ok`.
 	 */
@@ -219,11 +238,4 @@ export class AsyncResult<T, E> implements PromiseLike<Result<T, E>> {
 	async unwrapOrElse<U>(defaultValue: (error: E) => U): Promise<T | U> {
 		return (await this).unwrapOrElse(defaultValue);
 	}
-
-	/**
-	 * Async version of `Result#match`.
-	 */
-	async match<A, B>(matcher: ResultMatch<T, E, A, B>): Promise<A | B> {
-		return (await this).match(matcher);
-	}
 }

src/fn.ts

@@ -1,6 +1,6 @@
 import {type Result} from "./result";
 import {AsyncResult} from "./async_result";
-import {run, runAsync} from "./run";
+import {trySync, tryAsync} from "./try";
 import type {InferErr, InferOk} from "./util";
 
 /**
@@ -67,11 +67,11 @@ export function asyncFn(f: any): any {
  * })
  * ```
  */
-export function genFn<A extends any[], R extends Result<any, any>, T>(
+export function gen<A extends any[], R extends Result<any, any>, T>(
 	fn: (...args: A) => Generator<R, T, any>,
 ): (...args: A) => Result<T, InferErr<R>> {
 	return function (...args: any[]) {
-		return run(() => fn(...(args as A)));
+		return trySync(() => fn(...(args as A)));
 	};
 }
 
@@ -93,10 +93,10 @@ export function genFn<A extends any[], R extends Result<any, any>, T>(
  * })
  * ```
  */
-export function asyncGenFn<A extends any[], R extends AsyncResult<any, any> | Result<any, any>, T>(
+export function asyncGen<A extends any[], R extends AsyncResult<any, any> | Result<any, any>, T>(
 	fn: (...args: A) => AsyncGenerator<R, T, any>,
 ): (...args: A) => AsyncResult<T, InferErr<Awaited<R>>> {
 	return function (...args: any[]) {
-		return runAsync(() => fn(...(args as A)));
+		return tryAsync(() => fn(...(args as A)));
 	};
 }

src/index.ts

@@ -1,10 +1,8 @@
 export * from "./fn";
-export * from "./guard";
 export * from "./async_option";
 export * from "./option";
 export * from "./error";
 export * from "./async_result";
 export * from "./result";
-export * from "./run";
 export * from "./try";
 export * from "./util";