dataply 0.0.26-alpha.13 → 0.0.26-alpha.14

package/dist/cjs/index.js

@@ -10953,11 +10953,6 @@ var RowTableEngine = class {
   }
 };
 
-// src/utils/catchPromise.ts
-async function catchPromise(promise) {
-  return promise.then((res) => [void 0, res]).catch((reason) => [reason]);
-}
-
 // src/core/transaction/LockManager.ts
 var LockManager = class {
   lock;
@@ -11493,41 +11488,41 @@ var DataplyAPI = class {
       const release = await this.acquireWriteLock();
       const internalTx = this.createTransaction();
       internalTx.__setWriteLockRelease(release);
-      const [error2, result2] = await catchPromise(this.txContext.run(internalTx, () => callback(internalTx)));
-      if (error2) {
+      try {
+        const result = await this.txContext.run(internalTx, () => callback(internalTx));
+        await internalTx.commit();
+        return result;
+      } catch (error) {
         await internalTx.rollback();
-        throw error2;
+        throw error;
       }
-      await internalTx.commit();
-      return result2;
     }
     if (!tx.__hasWriteLockRelease()) {
       const release = await this.acquireWriteLock();
       tx.__setWriteLockRelease(release);
     }
-    const [error, result] = await catchPromise(this.txContext.run(tx, () => callback(tx)));
-    if (error) {
-      throw error;
+    if (this.txContext.get() === tx) {
+      return callback(tx);
     }
-    return result;
+    return this.txContext.run(tx, () => callback(tx));
   }
   async withReadTransaction(callback, tx) {
     this.logger.debug("Running with read transaction");
-    const isInternalTx = !tx;
     if (!tx) {
-      tx = this.createTransaction();
-    }
-    const [error, result] = await catchPromise(this.txContext.run(tx, () => callback(tx)));
-    if (error) {
-      if (isInternalTx) {
-        await tx.rollback();
+      const internalTx = this.createTransaction();
+      try {
+        const result = await this.txContext.run(internalTx, () => callback(internalTx));
+        await internalTx.commit();
+        return result;
+      } catch (error) {
+        await internalTx.rollback();
+        throw error;
       }
-      throw error;
     }
-    if (isInternalTx) {
-      await tx.commit();
+    if (this.txContext.get() === tx) {
+      return callback(tx);
     }
-    return result;
+    return this.txContext.run(tx, () => callback(tx));
   }
   /**
    * Runs a generator callback function within a transaction context.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataply",
-  "version": "0.0.26-alpha.13",
+  "version": "0.0.26-alpha.14",
   "description": "A lightweight storage engine for Node.js with support for MVCC, WAL.",
   "license": "MIT",
   "author": "izure <admin@izure.org>",