Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export function action<T>(executor: Executor<T>, desc?: string): Operation<T> {
discard();
discarded(Ok());
} catch (error) {
discarded(Err(error as Error));
discarded(Err(error));
}
};
},
Expand Down
2 changes: 1 addition & 1 deletion lib/box.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ export function* box<T>(op: () => Operation<T>): Operation<Result<T>> {
try {
return Ok(yield* op());
} catch (error) {
return Err(error as Error);
return Err(error);
}
}
2 changes: 1 addition & 1 deletion lib/delimiter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class Delimiter<T>
}
} catch (error) {
this.computed = true;
this.outcome = Just(Err(error as Error));
this.outcome = Just(Err(error));
} finally {
this.finalized = true;
this.outcome = this.outcome ?? Nothing();
Expand Down
2 changes: 1 addition & 1 deletion lib/race.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export function* race<T extends Operation<unknown>>(
let value = yield* operation;
winner.resolve(Ok(value as Yielded<T>));
} catch (error) {
winner.resolve(Err(error as Error));
winner.resolve(Err(error));
}
}),
);
Expand Down
2 changes: 1 addition & 1 deletion lib/reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export class Reducer {
throw result.error;
}
} catch (error) {
routine.next(Err(error as Error));
routine.next(Err(error));
}
item = queue.dequeue();
}
Expand Down
19 changes: 18 additions & 1 deletion lib/result.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,24 @@ export function Ok<T>(value?: T): Result<T | undefined> {
/**
* @ignore
*/
export const Err = <T>(error: Error): Result<T> => ({ ok: false, error });
export const Err = <T>(cause: unknown): Result<T> => ({
ok: false,
error: toError(cause),
});

class ThrowValueError extends Error {
constructor(message: string, options?: ErrorOptions) {
super(message, options);
this.name = "ThrowValueError";
}
}

function toError(cause: unknown): Error {
if (cause instanceof Error) {
return cause;
}
return new ThrowValueError(String(cause), { cause });
}

/**
* @ignore
Expand Down
2 changes: 1 addition & 1 deletion lib/scope-internal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export function createScopeInternal(
destructors.delete(destructor);
yield* destructor();
} catch (error) {
outcome = Err(error as Error);
outcome = Err(error);
}
}
} finally {
Expand Down
28 changes: 28 additions & 0 deletions test/result.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { describe, expect, it } from "./suite.ts";

import { Err, Ok } from "../mod.ts";

describe("Result", () => {
it("constructs successful results with Ok()", () => {
expect(Ok("hello")).toEqual({ ok: true, value: "hello" });
});

it("preserves Error instances passed to Err()", () => {
let error = new Error("oh no");

expect(Err(error)).toEqual({ ok: false, error });
});

it("wraps non-Error causes passed to Err()", () => {
let result = Err("oh no");

if (result.ok) {
throw new Error("expected Err() to produce a failed result");
}

expect(result.error).toBeInstanceOf(Error);
expect(result.error.name).toEqual("ThrowValueError");
expect(result.error.message).toEqual("oh no");
expect(result.error.cause).toEqual("oh no");
});
});
8 changes: 5 additions & 3 deletions test/until.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ describe("until", () => {
expect(yield* until(Promise.resolve(42))).toEqual(42);
});
});
it("throws on error", async () => {
expect.assertions(1);
it("wraps non-Error promise rejections", async () => {
expect.assertions(3);
await run(function* () {
try {
yield* until(Promise.reject("error"));
} catch (error) {
expect(error).toBe("error");
expect(error).toBeInstanceOf(Error);
expect((error as Error).message).toBe("error");
expect((error as Error).cause).toBe("error");
}
});
});
Expand Down