Skip to content
Merged
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
12 changes: 3 additions & 9 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/error/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"better-result": "2.6.0"
"faultier": "2.2.0"
},
"devDependencies": {
"@tooling/tsconfig": "workspace:*",
Expand Down
9 changes: 6 additions & 3 deletions packages/error/src/auth.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { TaggedError } from "better-result"
import * as Faultier from "faultier"

export class UnauthenticatedError extends TaggedError("AuthenticationError")() {}
export class UnauthenticatedError extends Faultier.Tagged("UnauthenticatedError")() {}

export class UnauthorizedError extends TaggedError("AuthorizationError")<{ userId: string }>() {}
export class UnauthorizedError extends Faultier.Tagged("UnauthorizedError")<{
userId: string
}>() {}

export type AuthenticationError = UnauthenticatedError | UnauthorizedError
export const AuthFault = Faultier.registry({ UnauthenticatedError, UnauthorizedError })
10 changes: 7 additions & 3 deletions packages/error/src/email.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
import { TaggedError } from "better-result"
import * as Faultier from "faultier"

export class SendEmailError extends TaggedError("SendEmailError")<{
export class SendEmailError extends Faultier.Tagged("SendEmailError")<{
emails: string[]
subject: string
from?: string
text: string
}>() {}

export class BatchSendEmailError extends TaggedError("BatchSendEmailError")<{
export class BatchSendEmailError extends Faultier.Tagged("BatchSendEmailError")<{
emails: string[]
subject: string
from?: string
}>() {}

export const EmailFault = Faultier.registry({
BatchSendEmailError,
SendEmailError,
})
export type EmailError = SendEmailError | BatchSendEmailError
8 changes: 8 additions & 0 deletions packages/error/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
import * as Faultier from "faultier"
import type { AuthenticationError } from "#auth.ts"
import type { EmailError } from "#email.ts"
import type { UtilityError } from "#utils.ts"

import { AuthFault } from "#auth.ts"
import { EmailFault } from "#email.ts"
import { UtilityFault } from "#utils.ts"

export const AppFault = Faultier.merge(AuthFault, EmailFault, UtilityFault)
export type AppError = AuthenticationError | EmailError | UtilityError

export * from "#auth.ts"
export * from "#email.ts"
export * from "#utils.ts"

export { matchTag, matchTags, Fault } from "faultier"
40 changes: 22 additions & 18 deletions packages/error/src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,37 @@
import { TaggedError } from "better-result"
import * as Faultier from "faultier"

export class InvalidDurationParseInputError extends TaggedError("InvalidDurationParseInputError")<{
message: string
export class InvalidDurationParseInputError extends Faultier.Tagged(
"InvalidDurationParseInputError"
)<{
value: string
}>() {
constructor(props: { value: string }) {
super({ ...props, message: `Unable to parse duration from input: "${props.value}"` })
}
}
}>() {}

export class InvalidDurationFormatInputError extends TaggedError(
export class InvalidDurationFormatInputError extends Faultier.Tagged(
"InvalidDurationFormatInputError"
)<{ message: string }>() {
constructor() {
super({ message: "Invalid duration format provided" })
}
}
)() {}

export class AssertUnreachableError extends TaggedError("AssertUnreachableError")<{
export class AssertUnreachableError extends Faultier.Tagged("AssertUnreachableError")<{
value: unknown
}>() {}

export class AssertConditionFailedError extends TaggedError("AssertConditionFailedError")<{
message: string
export class AssertConditionFailedError extends Faultier.Tagged("AssertConditionFailedError")<{
condition: string
}>() {}

export type DurationError = InvalidDurationParseInputError | InvalidDurationFormatInputError

export type AssertError = AssertUnreachableError | AssertConditionFailedError

export type UtilityError = DurationError | AssertError
export class InvalidBaseUrlError extends Faultier.Tagged("InvalidBaseUrlError")<{
value: string
}>() {}

export const UtilityFault = Faultier.registry({
AssertConditionFailedError,
AssertUnreachableError,
InvalidBaseUrlError,
InvalidDurationFormatInputError,
InvalidDurationParseInputError,
})

export type UtilityError = DurationError | AssertError | InvalidBaseUrlError
4 changes: 2 additions & 2 deletions packages/utils/src/assert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export function assertUnreachable(x: never): never {
*/
export function throwUnless(condition: boolean, message: string): asserts condition is true {
if (!condition) {
throw new AssertConditionFailedError({ condition: "throwUnless", message })
throw new AssertConditionFailedError({ condition: "throwUnless" }).withMessage(message)
}
}

Expand All @@ -22,6 +22,6 @@ export function throwUnless(condition: boolean, message: string): asserts condit
*/
export function throwIf(condition: boolean, message: string): asserts condition is false {
if (condition) {
throw new AssertConditionFailedError({ condition: "throwIf", message })
throw new AssertConditionFailedError({ condition: "throwIf" }).withMessage(message)
}
}
1 change: 0 additions & 1 deletion packages/utils/src/constants/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export * from "#constants/app.ts"
export * from "#constants/asset.ts"