tsondb 0.5.2 → 0.5.4

package/lib/node/index.js

@@ -5,7 +5,7 @@ import { parallelizeErrors } from "../shared/utils/validation.js";
 import { getEntities } from "./Schema.js";
 import { createValidators, validateEntityDecl } from "./schema/index.js";
 import { createServer } from "./server/index.js";
-import { getErrorMessageForDisplay, wrapErrorsIfAny } from "./utils/error.js";
+import { countErrors, getErrorMessageForDisplay, wrapErrorsIfAny } from "./utils/error.js";
 import { formatInstance, getInstancesByEntityName } from "./utils/instances.js";
 const debug = Debug("tsondb:schema");
 const prepareFolders = async (dataRootPath, entities) => {
@@ -21,7 +21,9 @@ export const generateOutputs = async (schema, outputs) => {
     }
 };
 const _validate = (dataRootPath, entities, instancesByEntityName) => {
-    const errors = entities.flatMap(entity => parallelizeErrors(instancesByEntityName[entity.name]?.map(instance => wrapErrorsIfAny(`in file "${join(dataRootPath, entity.name, instance.fileName)}"`, validateEntityDecl(createValidators(instancesByEntityName), entity, instance.content))) ?? []));
+    const errors = entities
+        .flatMap(entity => parallelizeErrors(instancesByEntityName[entity.name]?.map(instance => wrapErrorsIfAny(`in file "${join(dataRootPath, entity.name, instance.fileName)}"`, validateEntityDecl(createValidators(instancesByEntityName), entity, instance.content))) ?? []))
+        .toSorted((a, b) => a.message.localeCompare(b.message));
     if (errors.length === 0) {
         debug("All entities are valid");
     }
@@ -30,7 +32,7 @@ const _validate = (dataRootPath, entities, instancesByEntityName) => {
         for (const error of errors) {
             debug(getErrorMessageForDisplay(error) + "\n");
         }
-        throw new Error("Validation failed");
+        throw new Error(`Validation failed with ${countErrors(errors).toString()} errors`);
     }
 };
 export const validate = async (schema, dataRootPath) => {

package/lib/node/utils/error.d.ts

@@ -1,2 +1,4 @@
 export declare const getErrorMessageForDisplay: (error: Error) => string;
+export declare const countError: (error: Error) => number;
+export declare const countErrors: (errors: Error[]) => number;
 export declare const wrapErrorsIfAny: (message: string, errors: Error[]) => AggregateError | undefined;

package/lib/node/utils/error.js

@@ -13,6 +13,12 @@ export const getErrorMessageForDisplay = (error) => {
         return error.message;
     }
 };
+export const countError = (error) => error instanceof AggregateError
+    ? countErrors(error.errors.filter(subError => subError instanceof Error))
+    : error.cause instanceof Error
+        ? countError(error.cause)
+        : 1;
+export const countErrors = (errors) => errors.reduce((count, error) => count + countError(error), 0);
 export const wrapErrorsIfAny = (message, errors) => {
     if (errors.length === 0) {
         return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsondb",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "",
   "license": "ISC",
   "author": "Lukas Obermann",