fastify-txstate 3.2.15 → 3.3.0

package/lib/error.d.ts

@@ -1,16 +1,24 @@
-import { type FastifySchemaValidationError } from 'fastify/types/schema';
+import type { ValidationMessage } from '@txstate-mws/fastify-shared';
+import type { FastifySchemaValidationError } from 'fastify/types/schema';
 export declare class HttpError extends Error {
     statusCode: number;
     constructor(statusCode: number, message?: string);
 }
-type ValidationErrors = Record<string, string[]>;
 export declare class FailedValidationError extends HttpError {
-    errors: ValidationErrors;
-    constructor(errors: ValidationErrors);
+    errors: Record<string, string[]>;
+    constructor(errors: Record<string, string[]>);
+}
+export declare class ValidationError extends HttpError {
+    path?: string | undefined;
+    type?: "error" | "success" | "warning" | "system" | undefined;
+    constructor(message: string, path?: string | undefined, type?: "error" | "success" | "warning" | "system" | undefined);
+}
+export declare class ValidationErrors extends HttpError {
+    errors: ValidationMessage[];
+    constructor(errors: ValidationMessage[]);
 }
 export declare function fstValidationToMessage(v: FastifySchemaValidationError): {
     message: string | undefined;
     path: string;
     type: string;
 };
-export {};

package/lib/error.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fstValidationToMessage = exports.FailedValidationError = exports.HttpError = void 0;
+exports.fstValidationToMessage = exports.ValidationErrors = exports.ValidationError = exports.FailedValidationError = exports.HttpError = void 0;
 const http_status_codes_1 = require("http-status-codes");
 class HttpError extends Error {
     statusCode;
@@ -23,9 +23,28 @@ class FailedValidationError extends HttpError {
     constructor(errors) {
         super(422, 'Validation failure.');
         this.errors = errors;
+        this.errors = errors;
     }
 }
 exports.FailedValidationError = FailedValidationError;
+class ValidationError extends HttpError {
+    path;
+    type;
+    constructor(message, path, type) {
+        super(422, message);
+        this.path = path;
+        this.type = type;
+    }
+}
+exports.ValidationError = ValidationError;
+class ValidationErrors extends HttpError {
+    errors;
+    constructor(errors) {
+        super(422, errors[0]?.message);
+        this.errors = errors;
+    }
+}
+exports.ValidationErrors = ValidationErrors;
 function fstValidationToMessage(v) {
     const instancePath = v.keyword === 'required' ? v.instancePath + '/' + v.params.missingProperty : v.instancePath;
     return { message: v.message, path: instancePath.substring(1).replace(/\//g, '.'), type: 'error' };

package/lib/index.js

@@ -147,7 +147,7 @@ class Server {
                  * undefined before we validate.
                  */
                 if (schema != null)
-                    (0, txstate_utils_1.destroyNulls)(data);
+                    (0, txstate_utils_1.destroyNulls)((0, txstate_utils_1.stringifyDates)(data));
                 if (!validate(data))
                     throw new Error('Output validation failed. ' + validate.errors?.[0].instancePath + ': ' + validate.errors?.[0].message);
                 return JSON.stringify(data);
@@ -241,6 +241,12 @@ class Server {
                 if (err instanceof error_1.FailedValidationError) {
                     await res.status(err.statusCode).send(err.errors);
                 }
+                else if (err instanceof error_1.ValidationError) {
+                    await res.status(err.statusCode).send({ success: false, messages: [{ message: err.message, path: err.path, type: err.type ?? 'error' }] });
+                }
+                else if (err instanceof error_1.ValidationErrors) {
+                    await res.status(err.statusCode).send({ success: false, messages: err.errors });
+                }
                 else if (err instanceof error_1.HttpError) {
                     await res.status(err.statusCode).send(err.message);
                 }

package/lib-esm/index.js

@@ -4,6 +4,8 @@ export const devLogger = ftxst.devLogger
 export const prodLogger = ftxst.prodLogger
 export const HttpError = ftxst.HttpError
 export const FailedValidationError = ftxst.FailedValidationError
+export const ValidationError = ftxst.ValidationError
+export const ValidationErrors = ftxst.ValidationErrors
 export const unifiedAuthenticate = ftxst.unifiedAuthenticate
 export const unifiedAuthenticateAll = ftxst.unifiedAuthenticateAll
 export const analyticsPlugin = ftxst.analyticsPlugin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify-txstate",
-  "version": "3.2.15",
+  "version": "3.3.0",
   "description": "A small wrapper for fastify providing a set of common conventions & utility functions we use.",
   "exports": {
     ".": {
@@ -30,7 +30,7 @@
     "fastify-plugin": "^4.5.1",
     "http-status-codes": "^2.1.4",
     "jose": "^5.2.3",
-    "txstate-utils": "^1.9.1",
+    "txstate-utils": "^1.9.5",
     "ua-parser-js": "^1.0.37"
   },
   "devDependencies": {