tsondb 0.13.0 → 0.13.2

package/dist/src/node/index.js

@@ -9,7 +9,7 @@ import { createValidationContext } from "./schema/Node.js";
 import { getEntities } from "./schema/Schema.js";
 import { createServer } from "./server/index.js";
 import { asyncForEachInstanceInDatabaseInMemory, createDatabaseInMemory, getInstancesOfEntityFromDatabaseInMemory, } from "./utils/databaseInMemory.js";
-import { countErrors, getErrorMessageForDisplay, wrapErrorsIfAny } from "./utils/error.js";
+import { countError, countErrors, getErrorMessageForDisplay, wrapErrorsIfAny, } from "./utils/error.js";
 import { getFileNameForId, writeInstance } from "./utils/files.js";
 import { checkUniqueConstraintsForAllEntities } from "./utils/unique.js";
 const debug = Debug("tsondb:jsapi");
@@ -40,7 +40,8 @@ const _validate = (dataRootPath, entities, databaseInMemory, options = {}) => {
         .flatMap(entity => parallelizeErrors(getInstancesOfEntityFromDatabaseInMemory(databaseInMemory, entity.name).map(instance => wrapErrorsIfAny(`in file ${styleText("white", `"${dataRootPath}${sep}${styleText("bold", join(entity.name, getFileNameForId(instance.id)))}"`)}`, validateEntityDecl(validationContext, [], entity, instance.content)))))
         .toSorted((a, b) => a.message.localeCompare(b.message));
     if (errors.length > 0) {
-        debug(`${errors.length.toString()} structural integrity violation${errors.length === 1 ? "" : "s"} found`);
+        const errorCount = countErrors(errors);
+        debug(`${errorCount.toString()} structural integrity violation${errorCount === 1 ? "" : "s"} found`);
     }
     else {
         debug("No structural integrity violations found");
@@ -49,7 +50,8 @@ const _validate = (dataRootPath, entities, databaseInMemory, options = {}) => {
         debug("Checking unique constraints ...");
         const constraintResult = checkUniqueConstraintsForAllEntities(databaseInMemory, entities);
         if (isError(constraintResult)) {
-            debug(`${constraintResult.error.errors.length.toString()} unique constraint violation${constraintResult.error.errors.length === 1 ? "" : "s"} found`);
+            const errorCount = countError(constraintResult.error);
+            debug(`${errorCount.toString()} unique constraint violation${errorCount === 1 ? "" : "s"} found`);
             errors.push(constraintResult.error);
         }
         else {
@@ -60,11 +62,14 @@ const _validate = (dataRootPath, entities, databaseInMemory, options = {}) => {
         debug("Skipping unique constraint checks due to previous structural integrity errors");
     }
     if (errors.length === 0) {
-        debug("All entities are valid");
+        console.log("All entities are valid");
+        return true;
     }
     else {
-        console.error(styleText("red", "\n" + errors.map(err => getErrorMessageForDisplay(err)).join("\n\n")));
-        throw new Error(`Validation failed with ${countErrors(errors).toString()} errors`);
+        const errorCount = countErrors(errors);
+        console.error(`${errorCount.toString()} validation error${errorCount === 1 ? "" : "s"} found\n\n${errors.map(err => getErrorMessageForDisplay(err)).join("\n\n")}`);
+        process.exitCode = 1;
+        return false;
     }
 };
 export const validate = async (schema, dataRootPath, options) => {
@@ -96,8 +101,13 @@ export const generateValidateAndServe = async (schema, outputs, dataRootPath, de
     const entities = getEntities(schema);
     await prepareFolders(dataRootPath, entities);
     const databaseInMemory = await createDatabaseInMemory(dataRootPath, entities);
-    _validate(dataRootPath, entities, databaseInMemory, validationOptions);
-    await createServer(schema, dataRootPath, databaseInMemory, defaultLocales, homeLayoutSections, serverOptions, validationOptions, customStylesheetPath);
+    const isValid = _validate(dataRootPath, entities, databaseInMemory, validationOptions);
+    if (isValid) {
+        await createServer(schema, dataRootPath, databaseInMemory, defaultLocales, homeLayoutSections, serverOptions, validationOptions, customStylesheetPath);
+    }
+    else {
+        console.error("Not starting server due to invalid database");
+    }
 };
 export const format = async (schema, dataRootPath) => {
     const entities = getEntities(schema);

package/package.json

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