bun-query-builder 0.1.34 → 0.1.35

package/dist/bin/cli.js

@@ -11973,6 +11973,43 @@ function createSQLiteSQL(filename) {
       return Promise.reject(error);
     }
   };
+  let txDepth = 0;
+  sqlFunction.begin = async (fnOrName, maybeFn) => {
+    const fn = typeof fnOrName === "function" ? fnOrName : maybeFn;
+    if (typeof fn !== "function")
+      throw new TypeError("[query-builder] sqlite begin(): a transaction callback is required");
+    const isSavepoint = txDepth > 0;
+    const spName = `qb_sp_${txDepth}`;
+    if (isSavepoint)
+      wrapper.run(`SAVEPOINT ${spName}`);
+    else
+      wrapper.run("BEGIN");
+    txDepth++;
+    try {
+      const result = await fn(sqlFunction);
+      txDepth--;
+      if (isSavepoint)
+        wrapper.run(`RELEASE SAVEPOINT ${spName}`);
+      else
+        wrapper.run("COMMIT");
+      return result;
+    } catch (err) {
+      txDepth--;
+      try {
+        if (isSavepoint) {
+          wrapper.run(`ROLLBACK TO SAVEPOINT ${spName}`);
+          wrapper.run(`RELEASE SAVEPOINT ${spName}`);
+        } else {
+          wrapper.run("ROLLBACK");
+        }
+      } catch {}
+      throw err;
+    }
+  };
+  sqlFunction.savepoint = sqlFunction.begin;
+  sqlFunction.beginDistributed = async () => {
+    throw new Error("[query-builder] beginDistributed() (two-phase commit) is not supported on SQLite. Use begin()/transaction().");
+  };
   sqlFunction._wrapper = wrapper;
   return sqlFunction;
 }
@@ -15892,12 +15929,15 @@ function createQueryBuilder(state) {
     async transaction(fn, options) {
       const defaults = state?.txDefaults;
       const opts = { ...defaults, ...options };
+      const txConn = state?.sql ?? bunSql;
+      const nested = state?.inTransaction === true;
+      const txMethod = nested && typeof txConn?.savepoint === "function" ? "savepoint" : "begin";
       const runWith = async (attempt2) => {
         opts.logger?.({ type: "start", attempt: attempt2 });
         const start = Date.now();
-        return await bunSql.begin(async (tx) => {
-          const qb = createQueryBuilder({ sql: tx, meta, schema });
-          if (opts?.isolation) {
+        return await txConn[txMethod](async (tx) => {
+          const qb = createQueryBuilder({ sql: tx, meta, schema, inTransaction: true });
+          if (opts?.isolation && !nested) {
             const level = opts.isolation;
             const upper = level === "read committed" ? "READ COMMITTED" : level === "repeatable read" ? "REPEATABLE READ" : "SERIALIZABLE";
             if (config5.dialect === "postgres") {
@@ -15962,7 +16002,8 @@ function createQueryBuilder(state) {
       });
     },
     async beginDistributed(name, fn) {
-      const res = await bunSql.beginDistributed(name, async (tx) => {
+      const txConn = state?.sql ?? bunSql;
+      const res = await txConn.beginDistributed(name, async (tx) => {
         const qb = createQueryBuilder({ sql: tx, meta, schema });
         return await fn(qb);
       });
@@ -30112,7 +30153,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.1.34";
+var version2 = "0.1.35";
 
 // bin/cli.ts
 init_actions();

package/dist/client.d.ts

@@ -386,6 +386,7 @@ declare interface InternalState {
   meta?: SchemaMeta
   schema?: any
   txDefaults?: TransactionOptions
+  inTransaction?: boolean
 }
 declare interface TxBackoff { baseMs?: number, maxMs?: number, factor?: number, jitter?: boolean }
 declare interface TxLoggerEvent { type: 'start' | 'retry' | 'commit' | 'rollback' | 'error', attempt: number, error?: any, durationMs?: number }

package/dist/src/index.js

@@ -11973,6 +11973,43 @@ function createSQLiteSQL(filename) {
       return Promise.reject(error);
     }
   };
+  let txDepth = 0;
+  sqlFunction.begin = async (fnOrName, maybeFn) => {
+    const fn = typeof fnOrName === "function" ? fnOrName : maybeFn;
+    if (typeof fn !== "function")
+      throw new TypeError("[query-builder] sqlite begin(): a transaction callback is required");
+    const isSavepoint = txDepth > 0;
+    const spName = `qb_sp_${txDepth}`;
+    if (isSavepoint)
+      wrapper.run(`SAVEPOINT ${spName}`);
+    else
+      wrapper.run("BEGIN");
+    txDepth++;
+    try {
+      const result = await fn(sqlFunction);
+      txDepth--;
+      if (isSavepoint)
+        wrapper.run(`RELEASE SAVEPOINT ${spName}`);
+      else
+        wrapper.run("COMMIT");
+      return result;
+    } catch (err) {
+      txDepth--;
+      try {
+        if (isSavepoint) {
+          wrapper.run(`ROLLBACK TO SAVEPOINT ${spName}`);
+          wrapper.run(`RELEASE SAVEPOINT ${spName}`);
+        } else {
+          wrapper.run("ROLLBACK");
+        }
+      } catch {}
+      throw err;
+    }
+  };
+  sqlFunction.savepoint = sqlFunction.begin;
+  sqlFunction.beginDistributed = async () => {
+    throw new Error("[query-builder] beginDistributed() (two-phase commit) is not supported on SQLite. Use begin()/transaction().");
+  };
   sqlFunction._wrapper = wrapper;
   return sqlFunction;
 }
@@ -15892,12 +15929,15 @@ function createQueryBuilder(state) {
     async transaction(fn, options) {
       const defaults = state?.txDefaults;
       const opts = { ...defaults, ...options };
+      const txConn = state?.sql ?? bunSql;
+      const nested = state?.inTransaction === true;
+      const txMethod = nested && typeof txConn?.savepoint === "function" ? "savepoint" : "begin";
       const runWith = async (attempt2) => {
         opts.logger?.({ type: "start", attempt: attempt2 });
         const start = Date.now();
-        return await bunSql.begin(async (tx) => {
-          const qb = createQueryBuilder({ sql: tx, meta, schema });
-          if (opts?.isolation) {
+        return await txConn[txMethod](async (tx) => {
+          const qb = createQueryBuilder({ sql: tx, meta, schema, inTransaction: true });
+          if (opts?.isolation && !nested) {
             const level = opts.isolation;
             const upper = level === "read committed" ? "READ COMMITTED" : level === "repeatable read" ? "REPEATABLE READ" : "SERIALIZABLE";
             if (config5.dialect === "postgres") {
@@ -15962,7 +16002,8 @@ function createQueryBuilder(state) {
       });
     },
     async beginDistributed(name, fn) {
-      const res = await bunSql.beginDistributed(name, async (tx) => {
+      const txConn = state?.sql ?? bunSql;
+      const res = await txConn.beginDistributed(name, async (tx) => {
         const qb = createQueryBuilder({ sql: tx, meta, schema });
         return await fn(qb);
       });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-query-builder",
   "type": "module",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "A simple yet performant query builder for TypeScript. Built with Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",