chore: make UserError extend Error

Author: Julusian

packages/corelib/src/error.ts

@@ -128,10 +128,10 @@ export interface UserErrorObj {
 	/** The UserErrorMessage key (for matching certain error) */
 	readonly key: UserErrorMessage
 	/** The translatable string for the key */
-	readonly message: ITranslatableMessage
+	readonly userMessage: ITranslatableMessage
 }
 
-export class UserError implements UserErrorObj {
+export class UserError extends Error implements UserErrorObj {
 	public readonly errorCode: number
 
 	private constructor(
@@ -140,10 +140,11 @@ export class UserError implements UserErrorObj {
 		/** The UserErrorMessage key (for matching certain error) */
 		public readonly key: UserErrorMessage,
 		/** The translatable string for the key */
-		public readonly message: ITranslatableMessage,
+		public readonly userMessage: ITranslatableMessage,
 		/** Appropriate HTTP status code. Defaults to 500 for generic internal error. */
 		errorCode: number | undefined
 	) {
+		super()
 		this.errorCode = errorCode ?? 500
 	}
 
@@ -159,7 +160,7 @@ export class UserError implements UserErrorObj {
 	static fromUnknown(err: unknown, errorCode?: number): UserError {
 		if (err instanceof UserError) return err
 		if (this.isUserError(err))
-			return new UserError(new Error(err.rawError.toString()), err.key, err.message, err.errorCode)
+			return new UserError(new Error(err.rawError.toString()), err.key, err.userMessage, err.errorCode)
 
 		const err2 = err instanceof Error ? err : new Error(stringifyError(err))
 		return new UserError(
@@ -179,7 +180,7 @@ export class UserError implements UserErrorObj {
 		try {
 			const p = JSON.parse(str)
 			if (UserError.isUserError(p)) {
-				return new UserError(new Error(p.rawError.toString()), p.key, p.message, p.errorCode)
+				return new UserError(new Error(p.rawError.toString()), p.key, p.userMessage, p.errorCode)
 			} else {
 				return undefined
 			}
@@ -191,17 +192,17 @@ export class UserError implements UserErrorObj {
 	static toJSON(e: UserErrorObj): string {
 		return JSON.stringify({
 			rawError: stringifyError(e.rawError),
-			message: e.message,
+			userMessage: e.userMessage,
 			key: e.key,
 			errorCode: e.errorCode,
 		})
 	}
 
 	static isUserError(e: unknown): e is UserErrorObj {
-		return !(e instanceof Error) && !!e && typeof e === 'object' && 'rawError' in e && 'message' in e && 'key' in e
+		return !!e && typeof e === 'object' && 'rawError' in e && 'userMessage' in e && 'key' in e
 	}
 
 	toErrorString(): string {
-		return `${translateMessage(this.message, interpollateTranslation)}\n${stringifyError(this.rawError)}`
+		return `${translateMessage(this.userMessage, interpollateTranslation)}\n${stringifyError(this.rawError)}`
 	}
 }

packages/job-worker/src/__mocks__/_extendJest.ts

@@ -14,14 +14,14 @@ expect.extend({
 
 		const pass =
 			received instanceof UserError &&
-			received.message.key === expectedError.message.key &&
-			(args === undefined || JSON.stringify(args) === JSON.stringify(received.message.args))
+			received.userMessage.key === expectedError.userMessage.key &&
+			(args === undefined || JSON.stringify(args) === JSON.stringify(received.userMessage.args))
 
 		return {
 			message: () =>
 				`expected ${JSON.stringify(
-					received instanceof UserError ? received.message : received
-				)} to match ${JSON.stringify(expectedError.message)}`,
+					received instanceof UserError ? received.userMessage : received
+				)} to match ${JSON.stringify(expectedError.userMessage)}`,
 			pass: pass,
 		}
 	},

packages/meteor-lib/src/api/__tests__/client.test.ts

@@ -22,7 +22,7 @@ describe('ClientAPI', () => {
 			expect(error).toMatchObject({
 				error: {
 					key: UserErrorMessage.InactiveRundown,
-					message: {
+					userMessage: {
 						args: mockArgs,
 						key: 'Rundown must be active!',
 					},
@@ -37,7 +37,7 @@ describe('ClientAPI', () => {
 			expect(error).toMatchObject({
 				error: {
 					key: UserErrorMessage.InternalError,
-					message: {
+					userMessage: {
 						args: mockArgs,
 						key: 'An internal error occured!',
 					},