@pineliner/odb-client 1.1.2 → 1.1.3

package/dist/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 var __webpack_modules__ = {
-    "./src/orm/index.ts": function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+    "./src/orm/index.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.r(__webpack_exports__);
         __webpack_require__.d(__webpack_exports__, {
             ORM: ()=>ORM,
@@ -446,7 +446,7 @@ function __webpack_require__(moduleId) {
 })();
 (()=>{
     __webpack_require__.r = (exports1)=>{
-        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
             value: 'Module'
         });
         Object.defineProperty(exports1, '__esModule', {
@@ -458,53 +458,53 @@ var __webpack_exports__ = {};
 (()=>{
     __webpack_require__.r(__webpack_exports__);
     __webpack_require__.d(__webpack_exports__, {
-        insertValues: ()=>src_insertValues,
-        updateSet: ()=>src_updateSet,
         gte: ()=>orm.gte,
-        ODBLiteClient: ()=>ODBLiteClient,
-        QueryError: ()=>types_QueryError,
+        ODBLiteTransaction: ()=>ODBLiteTransaction,
+        updateSet: ()=>src_updateSet,
         sql: ()=>sql_parser_sql,
-        sqlFragment: ()=>sql_template_fragment,
-        ODBLiteError: ()=>ODBLiteError,
+        isNotNull: ()=>orm.isNotNull,
+        LibSQLAdapter: ()=>LibSQLAdapter,
         ORM: ()=>orm.ORM,
-        ConnectionError: ()=>ConnectionError,
         join: ()=>src_join,
-        convertTemplateToQuery: ()=>convertTemplateToQuery,
-        HTTPClient: ()=>HTTPClient,
-        BunSQLiteAdapter: ()=>BunSQLiteAdapter,
-        SQLParser: ()=>sql_parser_SQLParser,
+        lte: ()=>orm.lte,
         default: ()=>odblite,
+        splitSQLStatements: ()=>splitSQLStatements,
+        ne: ()=>orm.ne,
         gt: ()=>orm.gt,
         eq: ()=>orm.eq,
-        identifier: ()=>src_identifier,
-        lte: ()=>orm.lte,
-        ne: ()=>orm.ne,
-        parseSQL: ()=>parseSQL,
-        splitSQLStatements: ()=>splitSQLStatements,
-        where: ()=>src_where,
-        LibSQLAdapter: ()=>LibSQLAdapter,
-        ORMTransaction: ()=>orm.Transaction,
-        lt: ()=>orm.lt,
         fragment: ()=>fragment,
+        where: ()=>src_where,
+        identifier: ()=>src_identifier,
+        insertValues: ()=>src_insertValues,
+        ConnectionError: ()=>ConnectionError,
+        ODBLiteClient: ()=>ODBLiteClient,
         isNull: ()=>orm.isNull,
-        DatabaseManager: ()=>DatabaseManager,
+        HTTPClient: ()=>HTTPClient,
+        SQLParser: ()=>sql_parser_SQLParser,
+        BunSQLiteAdapter: ()=>BunSQLiteAdapter,
+        QueryError: ()=>types_QueryError,
+        createORM: ()=>orm.createORM,
+        lt: ()=>orm.lt,
         or: ()=>orm.or,
-        ODBLiteTransaction: ()=>ODBLiteTransaction,
-        ServiceClient: ()=>ServiceClient,
         and: ()=>orm.and,
         odblite: ()=>odblite,
+        parseSQL: ()=>parseSQL,
         rawSQL: ()=>sql_template_raw,
-        set: ()=>set,
-        sqlJoin: ()=>sql_template_join,
-        createORM: ()=>orm.createORM,
+        ServiceClient: ()=>ServiceClient,
+        ORMTransaction: ()=>orm.Transaction,
+        ODBLiteAdapter: ()=>ODBLiteAdapter,
+        convertTemplateToQuery: ()=>convertTemplateToQuery,
         empty: ()=>empty,
-        sqlTemplate: ()=>sql_template_sql,
+        set: ()=>set,
+        ODBLiteError: ()=>ODBLiteError,
         SimpleTransaction: ()=>SimpleTransaction,
         inArray: ()=>orm.inArray,
+        sqlFragment: ()=>sql_template_fragment,
+        sqlJoin: ()=>sql_template_join,
         sqlWhere: ()=>sql_template_where,
-        ODBLiteAdapter: ()=>ODBLiteAdapter,
-        isNotNull: ()=>orm.isNotNull,
+        DatabaseManager: ()=>DatabaseManager,
         like: ()=>orm.like,
+        sqlTemplate: ()=>sql_template_sql,
         raw: ()=>src_raw
     });
     class ODBLiteError extends Error {
@@ -2020,55 +2020,29 @@ var __webpack_exports__ = {};
             };
         }
         async transaction(fn) {
-            if (this.inTransaction) return fn(this);
+            if (this.inTransaction) {
+                const savepointName = `sp_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+                try {
+                    await this.execute(`SAVEPOINT ${savepointName}`);
+                    const result = await fn(this);
+                    await this.execute(`RELEASE SAVEPOINT ${savepointName}`);
+                    return result;
+                } catch (error) {
+                    await this.execute(`ROLLBACK TO SAVEPOINT ${savepointName}`).catch(()=>{});
+                    throw error;
+                }
+            }
             this.inTransaction = true;
-            const queuedStatements = [];
-            const txConnection = {
-                ...this,
-                execute: async (sql, params = [], options)=>{
-                    const sqlStr = 'string' == typeof sql ? sql : sql.sql;
-                    const sqlParams = 'string' == typeof sql ? params : sql.args || [];
-                    queuedStatements.push({
-                        sql: sqlStr,
-                        params: sqlParams
-                    });
-                    return {
-                        rows: [],
-                        rowsAffected: 0
-                    };
-                },
-                query: async (sql, params = [], options)=>{
-                    queuedStatements.push({
-                        sql,
-                        params
-                    });
-                    return {
-                        rows: [],
-                        rowsAffected: 0
-                    };
-                },
-                transaction: async (innerFn)=>innerFn(txConnection),
-                begin: async (innerFn)=>innerFn(txConnection)
-            };
             try {
-                const result = await fn(txConnection);
-                if (queuedStatements.length > 0) {
-                    const batchStatements = [
-                        {
-                            sql: 'BEGIN',
-                            params: []
-                        },
-                        ...queuedStatements,
-                        {
-                            sql: 'COMMIT',
-                            params: []
-                        }
-                    ];
-                    await this.client.sql.batch(batchStatements);
+                await this.execute('BEGIN');
+                try {
+                    const result = await fn(this);
+                    await this.execute('COMMIT');
+                    return result;
+                } catch (error) {
+                    await this.execute('ROLLBACK').catch(()=>{});
+                    throw error;
                 }
-                return result;
-            } catch (error) {
-                throw error;
             } finally{
                 this.inTransaction = false;
             }
@@ -2264,11 +2238,11 @@ var __webpack_exports__ = {};
             return Array.from(this.connections.keys());
         }
         async close() {
-            console.log(`🔌 Closing all database connections...`);
+            console.log("\uD83D\uDD0C Closing all database connections...");
             for (const [name, conn] of this.connections)await conn.close();
             this.connections.clear();
             this.connectionTimestamps.clear();
-            console.log(`✅ All connections closed`);
+            console.log("✅ All connections closed");
         }
         async runMigrations(conn, config) {
             const { pragmaStatements, regularStatements } = parseSQL(config.schemaContent);
@@ -2377,7 +2351,7 @@ exports.sqlTemplate = __webpack_exports__.sqlTemplate;
 exports.sqlWhere = __webpack_exports__.sqlWhere;
 exports.updateSet = __webpack_exports__.updateSet;
 exports.where = __webpack_exports__.where;
-for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+for(var __rspack_i in __webpack_exports__)if (-1 === [
     "BunSQLiteAdapter",
     "ConnectionError",
     "DatabaseManager",
@@ -2426,7 +2400,7 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "sqlWhere",
     "updateSet",
     "where"
-].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true
 });

package/dist/index.js

@@ -1,8 +1,9 @@
+import { __webpack_require__ } from "./rslib-runtime.js";
 import { Database } from "bun:sqlite";
 import { createClient } from "@libsql/client";
 import node_fs from "node:fs";
-var __webpack_modules__ = {
-    "./src/orm/index.ts": function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.add({
+    "./src/orm/index.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.r(__webpack_exports__);
         __webpack_require__.d(__webpack_exports__, {
             ORM: ()=>ORM,
@@ -415,38 +416,7 @@ var __webpack_modules__ = {
             return new ORM(db);
         }
     }
-};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
-(()=>{
-    __webpack_require__.d = (exports, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
-            enumerable: true,
-            get: definition[key]
-        });
-    };
-})();
-(()=>{
-    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
-})();
-(()=>{
-    __webpack_require__.r = (exports)=>{
-        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports, Symbol.toStringTag, {
-            value: 'Module'
-        });
-        Object.defineProperty(exports, '__esModule', {
-            value: true
-        });
-    };
-})();
+});
 class ODBLiteError extends Error {
     code;
     query;
@@ -1958,55 +1928,29 @@ class ODBLiteConnection {
         };
     }
     async transaction(fn) {
-        if (this.inTransaction) return fn(this);
+        if (this.inTransaction) {
+            const savepointName = `sp_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+            try {
+                await this.execute(`SAVEPOINT ${savepointName}`);
+                const result = await fn(this);
+                await this.execute(`RELEASE SAVEPOINT ${savepointName}`);
+                return result;
+            } catch (error) {
+                await this.execute(`ROLLBACK TO SAVEPOINT ${savepointName}`).catch(()=>{});
+                throw error;
+            }
+        }
         this.inTransaction = true;
-        const queuedStatements = [];
-        const txConnection = {
-            ...this,
-            execute: async (sql, params = [], options)=>{
-                const sqlStr = 'string' == typeof sql ? sql : sql.sql;
-                const sqlParams = 'string' == typeof sql ? params : sql.args || [];
-                queuedStatements.push({
-                    sql: sqlStr,
-                    params: sqlParams
-                });
-                return {
-                    rows: [],
-                    rowsAffected: 0
-                };
-            },
-            query: async (sql, params = [], options)=>{
-                queuedStatements.push({
-                    sql,
-                    params
-                });
-                return {
-                    rows: [],
-                    rowsAffected: 0
-                };
-            },
-            transaction: async (innerFn)=>innerFn(txConnection),
-            begin: async (innerFn)=>innerFn(txConnection)
-        };
         try {
-            const result = await fn(txConnection);
-            if (queuedStatements.length > 0) {
-                const batchStatements = [
-                    {
-                        sql: 'BEGIN',
-                        params: []
-                    },
-                    ...queuedStatements,
-                    {
-                        sql: 'COMMIT',
-                        params: []
-                    }
-                ];
-                await this.client.sql.batch(batchStatements);
+            await this.execute('BEGIN');
+            try {
+                const result = await fn(this);
+                await this.execute('COMMIT');
+                return result;
+            } catch (error) {
+                await this.execute('ROLLBACK').catch(()=>{});
+                throw error;
             }
-            return result;
-        } catch (error) {
-            throw error;
         } finally{
             this.inTransaction = false;
         }
@@ -2200,11 +2144,11 @@ class DatabaseManager {
         return Array.from(this.connections.keys());
     }
     async close() {
-        console.log(`🔌 Closing all database connections...`);
+        console.log("\uD83D\uDD0C Closing all database connections...");
         for (const [name, conn] of this.connections)await conn.close();
         this.connections.clear();
         this.connectionTimestamps.clear();
-        console.log(`✅ All connections closed`);
+        console.log("✅ All connections closed");
     }
     async runMigrations(conn, config) {
         const { pragmaStatements, regularStatements } = parseSQL(config.schemaContent);
@@ -2262,21 +2206,22 @@ class DatabaseManager {
         }
     }
 }
-var orm = __webpack_require__("./src/orm/index.ts");
 const { raw: src_raw, identifier: src_identifier, where: src_where, insertValues: src_insertValues, updateSet: src_updateSet, join: src_join } = ODBLiteClient;
-var __webpack_exports__ORM = orm.ORM;
-var __webpack_exports__ORMTransaction = orm.Transaction;
-var __webpack_exports__and = orm.and;
-var __webpack_exports__createORM = orm.createORM;
-var __webpack_exports__eq = orm.eq;
-var __webpack_exports__gt = orm.gt;
-var __webpack_exports__gte = orm.gte;
-var __webpack_exports__inArray = orm.inArray;
-var __webpack_exports__isNotNull = orm.isNotNull;
-var __webpack_exports__isNull = orm.isNull;
-var __webpack_exports__like = orm.like;
-var __webpack_exports__lt = orm.lt;
-var __webpack_exports__lte = orm.lte;
-var __webpack_exports__ne = orm.ne;
-var __webpack_exports__or = orm.or;
-export { BunSQLiteAdapter, ConnectionError, DatabaseManager, HTTPClient, LibSQLAdapter, ODBLiteAdapter, ODBLiteClient, ODBLiteError, ODBLiteTransaction, types_QueryError as QueryError, sql_parser_SQLParser as SQLParser, ServiceClient, SimpleTransaction, convertTemplateToQuery, odblite as default, empty, fragment, src_identifier as identifier, src_insertValues as insertValues, src_join as join, odblite, parseSQL, src_raw as raw, sql_template_raw as rawSQL, set, splitSQLStatements, sql_parser_sql as sql, sql_template_fragment as sqlFragment, sql_template_join as sqlJoin, sql_template_sql as sqlTemplate, sql_template_where as sqlWhere, src_updateSet as updateSet, src_where as where, __webpack_exports__ORM as ORM, __webpack_exports__ORMTransaction as ORMTransaction, __webpack_exports__and as and, __webpack_exports__createORM as createORM, __webpack_exports__eq as eq, __webpack_exports__gt as gt, __webpack_exports__gte as gte, __webpack_exports__inArray as inArray, __webpack_exports__isNotNull as isNotNull, __webpack_exports__isNull as isNull, __webpack_exports__like as like, __webpack_exports__lt as lt, __webpack_exports__lte as lte, __webpack_exports__ne as ne, __webpack_exports__or as or };
+const orm = __webpack_require__("./src/orm/index.ts");
+var ORM = orm.ORM;
+var Transaction = orm.Transaction;
+var and = orm.and;
+var createORM_0 = orm.createORM;
+var eq = orm.eq;
+var gt = orm.gt;
+var gte = orm.gte;
+var inArray = orm.inArray;
+var isNotNull = orm.isNotNull;
+var isNull = orm.isNull;
+var like = orm.like;
+var lt = orm.lt;
+var lte = orm.lte;
+var ne = orm.ne;
+var or = orm.or;
+export default odblite;
+export { BunSQLiteAdapter, ConnectionError, DatabaseManager, HTTPClient, LibSQLAdapter, ODBLiteAdapter, ODBLiteClient, ODBLiteError, ODBLiteTransaction, ORM, ServiceClient, SimpleTransaction, Transaction as ORMTransaction, and, convertTemplateToQuery, createORM_0 as createORM, empty, eq, fragment, gt, gte, inArray, isNotNull, isNull, like, lt, lte, ne, odblite, or, parseSQL, set, splitSQLStatements, sql_parser_SQLParser as SQLParser, sql_parser_sql as sql, sql_template_fragment as sqlFragment, sql_template_join as sqlJoin, sql_template_raw as rawSQL, sql_template_sql as sqlTemplate, sql_template_where as sqlWhere, src_identifier as identifier, src_insertValues as insertValues, src_join as join, src_raw as raw, src_updateSet as updateSet, src_where as where, types_QueryError as QueryError };

package/dist/rslib-runtime.js

@@ -0,0 +1,39 @@
+var __webpack_modules__ = {};
+var __webpack_module_cache__ = {};
+function __webpack_require__(moduleId) {
+    var cachedModule = __webpack_module_cache__[moduleId];
+    if (void 0 !== cachedModule) return cachedModule.exports;
+    var module = __webpack_module_cache__[moduleId] = {
+        exports: {}
+    };
+    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+    return module.exports;
+}
+__webpack_require__.m = __webpack_modules__;
+(()=>{
+    __webpack_require__.add = function(modules) {
+        Object.assign(__webpack_require__.m, modules);
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports, '__esModule', {
+            value: true
+        });
+    };
+})();
+export { __webpack_require__ };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pineliner/odb-client",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Isomorphic client for ODB-Lite with postgres.js-like template string SQL support",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -14,12 +14,12 @@
     "deploy": "bun run build && npm publish --access public"
   },
   "dependencies": {
-    "@libsql/client": "^0.15.15",
+    "@libsql/client": "^0.17.0",
     "node-sql-parser": "^5.3.12"
   },
   "devDependencies": {
     "@types/bun": "latest",
-    "@rslib/core": "0.15.0",
+    "@rslib/core": "0.19.3",
     "typescript": "^5.9.2"
   },
   "exports": {

package/src/database/adapters/odblite.ts

@@ -289,61 +289,50 @@ class ODBLiteConnection implements Connection {
   }
 
   /**
-   * Execute function in transaction using batch endpoint
-   * All statements are collected and executed atomically
+   * Execute function in transaction using immediate execution mode
+   *
+   * Each statement is executed immediately via the query endpoint,
+   * wrapped in BEGIN/COMMIT. This allows lastInsertRowid to be
+   * available for subsequent statements within the transaction.
+   *
+   * NOTE: Atomicity is maintained by the router's transaction lock
+   * which ensures all statements from BEGIN to COMMIT run on the
+   * same connection without interleaving from other requests.
    */
   async transaction<T>(fn: (tx: Connection) => Promise<T>): Promise<T> {
     if (this.inTransaction) {
-      // Nested transaction - just execute the function
-      return fn(this)
+      // Nested transaction - use savepoint
+      const savepointName = `sp_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`
+      try {
+        await this.execute(`SAVEPOINT ${savepointName}`)
+        const result = await fn(this)
+        await this.execute(`RELEASE SAVEPOINT ${savepointName}`)
+        return result
+      } catch (error) {
+        await this.execute(`ROLLBACK TO SAVEPOINT ${savepointName}`).catch(() => {})
+        throw error
+      }
     }
 
     this.inTransaction = true
-    const queuedStatements: Array<{ sql: string; params: any[] }> = []
 
-    // Create a transactional connection that queues statements
-    const txConnection: Connection = {
-      ...this,
-      execute: async (sql: string | { sql: string; args?: any[] }, params: any[] = [], options?: any) => {
-        const sqlStr = typeof sql === 'string' ? sql : sql.sql
-        const sqlParams = typeof sql === 'string' ? params : (sql.args || [])
+    try {
+      // Start transaction
+      await this.execute('BEGIN')
 
-        // Queue the statement
-        queuedStatements.push({ sql: sqlStr, params: sqlParams })
+      try {
+        // Execute user function - each statement executes immediately
+        const result = await fn(this)
 
-        // Return placeholder
-        return { rows: [], rowsAffected: 0 }
-      },
-      query: async (sql: string, params: any[] = [], options?: any) => {
-        queuedStatements.push({ sql, params })
-        return { rows: [], rowsAffected: 0 }
-      },
-      transaction: async (innerFn: any) => {
-        // For nested transactions, just execute inline
-        return innerFn(txConnection)
-      },
-      begin: async (innerFn: any) => {
-        return innerFn(txConnection)
-      }
-    } as Connection
+        // Commit transaction
+        await this.execute('COMMIT')
 
-    try {
-      const result = await fn(txConnection)
-
-      // Commit: execute all statements as a batch
-      if (queuedStatements.length > 0) {
-        const batchStatements = [
-          { sql: 'BEGIN', params: [] },
-          ...queuedStatements,
-          { sql: 'COMMIT', params: [] }
-        ]
-        await this.client.sql.batch(batchStatements)
+        return result
+      } catch (error) {
+        // Rollback on error
+        await this.execute('ROLLBACK').catch(() => {})
+        throw error
       }
-
-      return result
-    } catch (error) {
-      // On error, batch is never sent - implicit rollback
-      throw error
     } finally {
       this.inTransaction = false
     }