From 54b0b523d40f4d72d624afd9d6a76a0e3a984721 Mon Sep 17 00:00:00 2001 From: Edoardo Ranghieri Date: Thu, 30 May 2024 02:18:58 +0200 Subject: [PATCH] refactor: rename `ServerValidationError` class to `ActionServerValidationError` --- packages/next-safe-action/src/action-builder.ts | 6 +++--- packages/next-safe-action/src/validation-errors.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/next-safe-action/src/action-builder.ts b/packages/next-safe-action/src/action-builder.ts index 8d4762c..821aa99 100644 --- a/packages/next-safe-action/src/action-builder.ts +++ b/packages/next-safe-action/src/action-builder.ts @@ -14,7 +14,7 @@ import type { } from "./index.types"; import type { InferArray } from "./utils"; import { DEFAULT_SERVER_ERROR_MESSAGE, isError } from "./utils"; -import { ServerValidationError, buildValidationErrors } from "./validation-errors"; +import { ActionServerValidationError, buildValidationErrors } from "./validation-errors"; import type { BindArgsValidationErrors, FormatBindArgsValidationErrorsFn, @@ -223,8 +223,8 @@ export function actionBuilder< throw e; } - // If error is ServerValidationError, return validationErrors as if schema validation would fail. - if (e instanceof ServerValidationError) { + // If error is `ActionServerValidationError`, return `validationErrors` as if schema validation would fail. + if (e instanceof ActionServerValidationError) { const ve = e.validationErrors as ValidationErrors; middlewareResult.validationErrors = await Promise.resolve(args.formatValidationErrors?.(ve) ?? ve); } else { diff --git a/packages/next-safe-action/src/validation-errors.ts b/packages/next-safe-action/src/validation-errors.ts index f9445c1..7e35368 100644 --- a/packages/next-safe-action/src/validation-errors.ts +++ b/packages/next-safe-action/src/validation-errors.ts @@ -52,7 +52,7 @@ export const buildValidationErrors = (issues: Vali // This class is internally used to throw validation errors in action's server code function, using // `returnValidationErrors`. -export class ServerValidationError extends Error { +export class ActionServerValidationError extends Error { public validationErrors: ValidationErrors; constructor(validationErrors: ValidationErrors) { super("Server Validation Error"); @@ -69,7 +69,7 @@ export class ServerValidationError extends Error { * {@link https://next-safe-action.dev/docs/recipes/additional-validation-errors#returnvalidationerrors See docs for more information} */ export function returnValidationErrors(schema: S, validationErrors: ValidationErrors): never { - throw new ServerValidationError(validationErrors); + throw new ActionServerValidationError(validationErrors); } /**