Skip to content
Open
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
25 changes: 11 additions & 14 deletions packages/payload/src/utilities/formatErrors.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,30 @@
import type { ErrorResult } from '../config/types.js'
import type { APIError } from '../errors/APIError.js'

import { APIErrorName } from '../errors/APIError.js'
import { ValidationErrorName } from '../errors/ValidationError.js'
import { APIError } from '../errors/APIError.js'
import { ValidationError } from '../errors/ValidationError.js'

export const formatErrors = (incoming: { [key: string]: unknown } | APIError): ErrorResult => {
if (incoming) {
// Cannot use `instanceof` to check error type: https://github.com/microsoft/TypeScript/issues/13965
// Instead, get the prototype of the incoming error and check its constructor name
const proto = Object.getPrototypeOf(incoming)

// Payload 'ValidationError' and 'APIError'
if (
(proto.constructor.name === ValidationErrorName || proto.constructor.name === APIErrorName) &&
incoming.data
) {
if ((incoming instanceof ValidationError || incoming instanceof APIError) && incoming.data) {
return {
errors: [
{
name: incoming.name as string,
name: incoming.name,
data: incoming.data as Record<string, unknown>,
message: incoming.message as string,
message: incoming.message,
},
],
}
}

// Mongoose 'ValidationError': https://mongoosejs.com/docs/api/error.html#Error.ValidationError
if (proto.constructor.name === ValidationErrorName && 'errors' in incoming && incoming.errors) {
if (
'name' in incoming &&
incoming.name === 'ValidationError' &&
'errors' in incoming &&
incoming.errors
) {
return {
errors: Object.keys(incoming.errors).reduce(
(acc, key) => {
Expand Down
Loading