tsondb 0.19.6 → 0.19.7

package/dist/src/node/index.js

@@ -164,8 +164,9 @@ export class TSONDB {
         };
         return validateDeclStructuralIntegrity(validationContext, [], entity, [], instanceContent);
     }
-    #validate(data, skipForTransaction = false) {
+    #validate(data, options = {}) {
         const { checkReferentialIntegrity, checkOnlyEntities } = this.#validationOptions;
+        const { skipStructuralValidation = false, logToConsole = true, changedEntities: changedEntityNames, } = options;
         const entities = this.#schema.entities;
         const getEntity = this.#schema.getEntity.bind(this.#schema);
         for (const onlyEntity of checkOnlyEntities) {
@@ -176,12 +177,15 @@ export class TSONDB {
         const onlyEntities = checkOnlyEntities.length > 0
             ? entities.filter(entity => checkOnlyEntities.includes(entity.name))
             : entities;
+        const changedEntities = changedEntityNames
+            ? entities.filter(entity => changedEntityNames.includes(entity.name))
+            : undefined;
         const validationContext = {
             validationOptions: this.#validationOptions,
             useStyling: true,
         };
         const errors = [];
-        if (!skipForTransaction) {
+        if (!skipStructuralValidation) {
             debug("Checking structural integrity ...");
             const structureErrors = onlyEntities
                 .flatMap(entity => parallelizeErrors(data
@@ -198,7 +202,7 @@ export class TSONDB {
             }
         }
         if (errors.length === 0) {
-            if (!skipForTransaction) {
+            if (!skipStructuralValidation) {
                 if (checkReferentialIntegrity) {
                     debug("Checking referential integrity ...");
                     const referenceValidator = createReferenceValidator(this.#schema.isEntityName.bind(this.#schema), data, true);
@@ -222,7 +226,7 @@ export class TSONDB {
             }
             debug("Checking unique constraints ...");
             const instanceOverviewsByEntityName = getAllInstanceOverviewsByEntityName(getEntity, data, this.#locales);
-            const uniqueConstraintResult = checkUniqueConstraintsForAllEntities(data, onlyEntities, instanceOverviewsByEntityName);
+            const uniqueConstraintResult = checkUniqueConstraintsForAllEntities(data, changedEntities ?? onlyEntities, instanceOverviewsByEntityName);
             if (isError(uniqueConstraintResult)) {
                 const errorCount = countError(uniqueConstraintResult.error);
                 debug(`${errorCount.toString()} unique constraint violation${errorCount === 1 ? "" : "s"} found`);
@@ -245,13 +249,15 @@ export class TSONDB {
         else {
             debug("Skipping further checks due to previous structural integrity errors");
         }
-        console.log(`${data.totalSize.toString()} instance${data.totalSize === 1 ? "" : "s"} checked`);
-        if (errors.length === 0) {
-            console.log(styleText("green", "All instances are valid"));
-        }
-        else {
-            const errorCount = countErrors(errors);
-            console.error(styleText("red", `${errorCount.toString()} validation error${errorCount === 1 ? "" : "s"} found\n\n${errors.map(err => getErrorMessageForDisplay(err)).join("\n\n")}`, { stream: stderr }));
+        if (logToConsole) {
+            console.log(`${data.totalSize.toString()} instance${data.totalSize === 1 ? "" : "s"} checked`);
+            if (errors.length === 0) {
+                console.log(styleText("green", "All instances are valid"));
+            }
+            else {
+                const errorCount = countErrors(errors);
+                console.error(styleText("red", `${errorCount.toString()} validation error${errorCount === 1 ? "" : "s"} found\n\n${errors.map(err => getErrorMessageForDisplay(err)).join("\n\n")}`, { stream: stderr }));
+            }
         }
         return errors;
     }
@@ -261,25 +267,30 @@ export class TSONDB {
      * Returns `true` if the data is valid, `false` otherwise.
      */
     validate() {
+        debug("Validating database ...");
         return this.#validate(this.#data).length === 0;
     }
     /**
      * Formats the data on disk according to the current in-memory representation.
      */
     async format() {
+        debug("Formatting database ...");
         await this.#data.forEachInstance(async (entityName, instance) => {
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             const entity = this.#schema.getEntity(entityName);
             await writeInstance(this.#dataRootPath, entity, instance.id, instance.content);
         }, true);
+        debug("All data is formatted");
     }
     /**
      * Reloads the data from disk into memory.
      */
     async sync() {
+        debug("Syncing with disk ...");
         const { data, referencesToInstances } = await initData(this.#dataRootPath, this.#schema, this.#locales, this.#git, undefined, false);
         this.#data = data;
         this.#referencesToInstances = referencesToInstances;
+        debug("Synced with disk");
     }
     /**
      * Runs a transaction on the database.
@@ -289,8 +300,10 @@ export class TSONDB {
      */
     async runTransaction(fn) {
         if (this.#locked) {
+            debug("Another transaction is currently running");
             throw new HTTPError(503, "Another transaction is currently running. Transactions cannot be run concurrently.");
         }
+        debug("Starting transaction, locking database ...");
         this.#locked = true;
         try {
             const getEntity = this.#schema.getEntity.bind(this.#schema);
@@ -304,12 +317,19 @@ export class TSONDB {
             }));
             const txtResult = txn.getResult();
             const { data: newData, referencesToInstances: newRefs, steps } = txtResult;
-            const errors = this.#validate(newData, true);
+            const changedEntities = [...new Set(steps.map(step => step.entity.name))];
+            const errors = this.#validate(newData, {
+                logToConsole: false,
+                skipStructuralValidation: true,
+                changedEntities,
+            });
             if (errors.length > 0) {
+                debug("Transaction validation failed with %d error%s", errors.length, errors.length === 1 ? "" : "s");
                 throw new AggregateError(errors, "Validation errors occurred");
             }
             const diskResult = await applyStepsToDisk(this.#dataRootPath, steps);
             if (isError(diskResult)) {
+                debug("Error applying changes to disk: %s", diskResult.error.message);
                 throw diskResult.error;
             }
             if (this.#git) {
@@ -322,6 +342,7 @@ export class TSONDB {
             }
             this.#referencesToInstances = newRefs;
             this.#locked = false;
+            debug("Transaction successful, released lock");
             return res;
         }
         catch (error) {

package/dist/src/node/utils/references.js

@@ -1,12 +1,10 @@
 import { removeAt } from "@elyukai/utils/array/modify";
 import { difference } from "@elyukai/utils/array/sets";
 import { isOk } from "@elyukai/utils/result";
-import Debug from "debug";
 import { resolve } from "node:path";
 import { getReferences } from "../schema/treeOperations/references.js";
 import {} from "./databaseInMemory.js";
 import { WorkerPool } from "./workers.js";
-const debug = Debug("tsondb:utils:references");
 export const isReferencedByOtherInstances = (referencesToInstances, instanceId, otherInstancesToDelete) => {
     const allInstancesToDelete = [instanceId, ...(otherInstancesToDelete ?? [])];
     return referencesToInstances[instanceId]?.some(ref => allInstancesToDelete.includes(ref)) ?? false;
@@ -37,15 +35,11 @@ const removeReference = (acc, reference, instanceId) => {
 };
 const removeReferences = (acc, references, instanceId) => references.reduce((acc1, reference) => removeReference(acc1, reference, instanceId), acc);
 export const getReferencesToInstances = async (databaseInMemory, serializedDeclarationsByName) => {
-    debug("creating reference worker pool ...");
     const pool = new WorkerPool(6, resolve(import.meta.dirname, "./referencesWorker.js"), serializedDeclarationsByName);
-    debug("collecting references ...");
     const separateResults = await Promise.all(databaseInMemory.getAllInstances().map(([entityName, instances]) => new Promise((resolve, reject) => {
         try {
-            debug("collecting references for entity %s in %d instances", entityName, instances.length);
             pool.runTask({ entityName, instances }, result => {
                 if (isOk(result)) {
-                    debug("collected references for entity %s in %d instances", entityName, instances.length);
                     resolve(result.value);
                 }
                 else {
@@ -54,13 +48,11 @@ export const getReferencesToInstances = async (databaseInMemory, serializedDecla
             });
         }
         catch (err) {
-            debug("error collecting references for entity %s: %O", entityName, err);
             reject(err);
         }
     })));
     await pool.close();
     const results = separateResults.reduce(mergeReferences, {});
-    debug("collected references");
     return results;
 };
 export const updateReferencesToInstances = (getEntity, referencesToInstances, entityName, instanceId, oldInstance, newInstance) => {

package/package.json

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