tsondb 0.19.4 → 0.19.6

package/dist/src/node/index.js

@@ -21,7 +21,7 @@ import { checkCustomConstraintsForAllEntities } from "./utils/customConstraints.
 import { DatabaseInMemory } from "./utils/databaseInMemory.js";
 import { applyStepsToDisk } from "./utils/databaseOnDisk.js";
 import { getAllInstanceOverviewsByEntityName, getDisplayNameFromEntityInstance, getInstanceOverview, getInstanceOverviewsByEntityName, } from "./utils/displayName.js";
-import { countError, countErrors, getErrorMessageForDisplay, wrapErrorsIfAny, } from "./utils/error.js";
+import { countError, countErrors, getErrorMessageForDisplay, HTTPError, wrapErrorsIfAny, } from "./utils/error.js";
 import { getFileNameForId, writeInstance } from "./utils/files.js";
 import { attachGitStatusToDatabaseInMemory } from "./utils/git.js";
 import { getReferencesToInstances, isReferencedByOtherInstances, } from "./utils/references.js";
@@ -94,6 +94,7 @@ export class TSONDB {
     #referencesToInstances;
     #validationOptions;
     #gitWrapper;
+    #locked = false;
     constructor(options) {
         this.#dataRootPath = options.dataRootPath;
         this.#data = options.data;
@@ -287,35 +288,46 @@ export class TSONDB {
      * @throws {Error} when the transaction could not be completed
      */
     async runTransaction(fn) {
-        const getEntity = this.#schema.getEntity.bind(this.#schema);
-        const [txn, res] = fn(new Transaction({
-            data: this.#data,
-            getEntity,
-            referencesToInstances: this.#referencesToInstances,
-            validate: this.#strucurallyValidateInstance.bind(this),
-            localeEntity: this.#schema.localeEntity,
-            steps: [],
-        }));
-        const txtResult = txn.getResult();
-        const { data: newData, referencesToInstances: newRefs, steps } = txtResult;
-        const errors = this.#validate(newData, true);
-        if (errors.length > 0) {
-            throw new AggregateError(errors, "Validation errors occurred");
-        }
-        const diskResult = await applyStepsToDisk(this.#dataRootPath, steps);
-        if (isError(diskResult)) {
-            throw diskResult.error;
+        if (this.#locked) {
+            throw new HTTPError(503, "Another transaction is currently running. Transactions cannot be run concurrently.");
         }
-        if (this.#git) {
-            const status = await this.#git.client.status();
-            const newDbWithUpdatedGit = attachGitStatusToDatabaseInMemory(newData, this.#dataRootPath, this.#git.root, status);
-            this.#data = newDbWithUpdatedGit;
+        this.#locked = true;
+        try {
+            const getEntity = this.#schema.getEntity.bind(this.#schema);
+            const [txn, res] = fn(new Transaction({
+                data: this.#data,
+                getEntity,
+                referencesToInstances: this.#referencesToInstances,
+                validate: this.#strucurallyValidateInstance.bind(this),
+                localeEntity: this.#schema.localeEntity,
+                steps: [],
+            }));
+            const txtResult = txn.getResult();
+            const { data: newData, referencesToInstances: newRefs, steps } = txtResult;
+            const errors = this.#validate(newData, true);
+            if (errors.length > 0) {
+                throw new AggregateError(errors, "Validation errors occurred");
+            }
+            const diskResult = await applyStepsToDisk(this.#dataRootPath, steps);
+            if (isError(diskResult)) {
+                throw diskResult.error;
+            }
+            if (this.#git) {
+                const status = await this.#git.client.status();
+                const newDbWithUpdatedGit = attachGitStatusToDatabaseInMemory(newData, this.#dataRootPath, this.#git.root, status);
+                this.#data = newDbWithUpdatedGit;
+            }
+            else {
+                this.#data = newData;
+            }
+            this.#referencesToInstances = newRefs;
+            this.#locked = false;
+            return res;
         }
-        else {
-            this.#data = newData;
+        catch (error) {
+            this.#locked = false;
+            throw error;
         }
-        this.#referencesToInstances = newRefs;
-        return res;
     }
     /**
      * Creates a new instance in the database.

package/package.json

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