@pineliner/odb-client 1.0.3 → 1.0.5

package/dist/database/sql-parser.d.ts

@@ -7,7 +7,7 @@ export interface SQLParserOptions {
 }
 /**
  * Parse SQL file into statements, separating PRAGMA from regular SQL
- * Uses node-sql-parser for robust SQL parsing
+ * Uses custom parser that handles BEGIN...END blocks
  */
 export declare function parseSQL(sqlContent: string, options?: SQLParserOptions): ParsedStatements;
 /**

package/dist/database/sql-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql-parser.d.ts","sourceRoot":"","sources":["../../src/database/sql-parser.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,iBAAiB,EAAE,MAAM,EAAE,CAAA;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,gBAAgB,CA0B7F;AAwHD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAG/D"}
+{"version":3,"file":"sql-parser.d.ts","sourceRoot":"","sources":["../../src/database/sql-parser.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,iBAAiB,EAAE,MAAM,EAAE,CAAA;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,gBAAgB,CA0B7F;AAoFD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAG/D"}

package/dist/database/types.d.ts

@@ -19,13 +19,15 @@ export interface QueryResult<T = any> {
  * All backends implement this through adapters
  */
 export interface Connection {
-    query<T = any>(strings: TemplateStringsArray, ...values: any[]): Promise<QueryResult<T>>;
+    sql<T = any>(strings: TemplateStringsArray, ...values: any[]): Promise<QueryResult<T>>;
+    query<T = any>(sql: string, params?: any[]): Promise<QueryResult<T>>;
     execute(sql: string | {
         sql: string;
         args?: any[];
     }, params?: any[]): Promise<QueryResult>;
     prepare(sql: string): PreparedStatement;
     transaction<T>(fn: (tx: Connection) => Promise<T>): Promise<T>;
+    begin<T>(fn: (tx: Connection) => Promise<T>): Promise<T>;
     close(): Promise<void>;
 }
 /**

package/dist/database/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/database/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/database/types.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,MAAM,WAAW,GACnB,WAAW,GACX,cAAc,GACd,WAAW,GACX,WAAW,CAAA;AAEf;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,YAAY,GAAG,QAAQ,GAAG,SAAS,CAAA;AAE7D;;GAEG;AACH,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,GAAG;IAClC,IAAI,EAAE,CAAC,EAAE,CAAA;IACT,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAClC;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IAEzB,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;IAGtF,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;IACpE,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;KAAE,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;IAC1F,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAA;IAGvC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IAC9D,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IAGxD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;IAC7C,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;IACnC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAA;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;IAG1B,OAAO,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IACzC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAG5C,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAA;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,MAAM,CAAA;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IAEpC,OAAO,EAAE,WAAW,CAAA;IAGpB,YAAY,EAAE,MAAM,CAAA;IAGpB,MAAM,CAAC,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB,CAAA;IAED,OAAO,CAAC,EAAE;QACR,UAAU,EAAE,MAAM,CAAA;QAClB,MAAM,EAAE,MAAM,CAAA;QACd,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,CAAA;IAGD,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,IAAI,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC/B"}

package/dist/index.cjs

@@ -1120,26 +1120,41 @@ const external_bun_sqlite_namespaceObject = require("bun:sqlite");
     }
     /**
    * Template tag query (postgres.js-like)
-   */ async query(strings, ...values) {
+   */ async sql(strings, ...values) {
         // Build SQL from template
-        const sql = strings.reduce((acc, str, i)=>acc + str + (i < values.length ? '?' : ''), '');
-        return this.execute(sql, values);
+        const sqlStr = strings.reduce((acc, str, i)=>acc + str + (i < values.length ? '?' : ''), '');
+        return this.execute(sqlStr, values);
+    }
+    /**
+   * Query with SQL string and parameters (alias for execute)
+   */ async query(sql, params = []) {
+        return this.execute(sql, params);
     }
     /**
    * Execute SQL with parameters
    */ async execute(sql, params = []) {
         try {
-            const stmt = this.db.query(sql);
-            const isSelect = sql.trim().toUpperCase().startsWith('SELECT');
+            // Handle object format { sql, args }
+            let sqlStr;
+            let sqlParams;
+            if ('object' == typeof sql) {
+                sqlStr = sql.sql;
+                sqlParams = sql.args || [];
+            } else {
+                sqlStr = sql;
+                sqlParams = params;
+            }
+            const stmt = this.db.query(sqlStr);
+            const isSelect = sqlStr.trim().toUpperCase().startsWith('SELECT') || sqlStr.trim().toUpperCase().includes('RETURNING');
             if (isSelect) {
-                const rows = stmt.all(...params);
+                const rows = stmt.all(...sqlParams);
                 return {
                     rows: rows,
                     rowsAffected: 0
                 };
             }
             {
-                const result = stmt.run(...params);
+                const result = stmt.run(...sqlParams);
                 return {
                     rows: [],
                     rowsAffected: result.changes || 0,
@@ -1196,6 +1211,11 @@ const external_bun_sqlite_namespaceObject = require("bun:sqlite");
         }
     }
     /**
+   * Execute function in transaction (alias for transaction)
+   */ async begin(fn) {
+        return this.transaction(fn);
+    }
+    /**
    * Close connection
    */ async close() {
         this.db.close();
@@ -1246,10 +1266,15 @@ const external_libsql_client_namespaceObject = require("@libsql/client");
     }
     /**
    * Template tag query (postgres.js-like)
-   */ async query(strings, ...values) {
+   */ async sql(strings, ...values) {
         // Build SQL from template
-        const sql = strings.reduce((acc, str, i)=>acc + str + (i < values.length ? '?' : ''), '');
-        return this.execute(sql, values);
+        const sqlStr = strings.reduce((acc, str, i)=>acc + str + (i < values.length ? '?' : ''), '');
+        return this.execute(sqlStr, values);
+    }
+    /**
+   * Query with SQL string and parameters (alias for execute)
+   */ async query(sql, params = []) {
+        return this.execute(sql, params);
     }
     /**
    * Execute SQL with parameters
@@ -1308,6 +1333,11 @@ const external_libsql_client_namespaceObject = require("@libsql/client");
         }
     }
     /**
+   * Execute function in transaction (alias for transaction)
+   */ async begin(fn) {
+        return this.transaction(fn);
+    }
+    /**
    * Close connection
    */ async close() {
     // LibSQL client.close() if available in future versions
@@ -1380,7 +1410,7 @@ const external_libsql_client_namespaceObject = require("@libsql/client");
     }
     /**
    * Template tag query (postgres.js-like)
-   */ async query(strings, ...values) {
+   */ async sql(strings, ...values) {
         // ODBLiteClient.sql is a function that returns a Promise
         const result = await this.client.sql(strings, ...values);
         return {
@@ -1389,9 +1419,23 @@ const external_libsql_client_namespaceObject = require("@libsql/client");
         };
     }
     /**
+   * Query with SQL string and parameters (alias for execute)
+   */ async query(sql, params = []) {
+        return this.execute(sql, params);
+    }
+    /**
    * Execute SQL with parameters
    */ async execute(sql, params = []) {
         try {
+            // Handle object format { sql, args }
+            if ('object' == typeof sql) {
+                const result = await this.client.sql.execute(sql.sql, sql.args || []);
+                return {
+                    rows: result.rows,
+                    rowsAffected: result.rowsAffected || 0
+                };
+            }
+            // Handle string format
             const result = await this.client.sql.execute(sql, params);
             return {
                 rows: result.rows,
@@ -1435,20 +1479,24 @@ const external_libsql_client_namespaceObject = require("@libsql/client");
         }
     }
     /**
+   * Execute function in transaction (alias for transaction)
+   */ async begin(fn) {
+        return this.transaction(fn);
+    }
+    /**
    * Close connection
    */ async close() {
     // ODBLiteClient connections are stateless HTTP requests
     // No explicit close needed
     }
 }
-const external_node_sql_parser_namespaceObject = require("node-sql-parser");
 /**
  * Parse SQL file into statements, separating PRAGMA from regular SQL
- * Uses node-sql-parser for robust SQL parsing
+ * Uses custom parser that handles BEGIN...END blocks
  */ function parseSQL(sqlContent, options = {}) {
     const separatePragma = options.separatePragma ?? true;
-    // Use node-sql-parser to properly split SQL statements
-    const statements = splitStatementsWithParser(sqlContent);
+    // Split SQL statements manually
+    const statements = splitStatements(sqlContent);
     if (!separatePragma) return {
         pragmaStatements: [],
         regularStatements: statements
@@ -1465,54 +1513,29 @@ const external_node_sql_parser_namespaceObject = require("node-sql-parser");
         regularStatements
     };
 }
-/**
- * Split SQL content using node-sql-parser (more robust than custom parser)
- * Falls back to simple split if parser fails
- */ function splitStatementsWithParser(sqlContent) {
-    try {
-        const parser = new external_node_sql_parser_namespaceObject.Parser();
-        // node-sql-parser supports splitting multiple statements
-        // Try to use it, but have fallback for edge cases
-        const opt = {
-            database: 'sqlite',
-            type: 'table'
-        };
-        // Split by semicolons first to handle parser limitations with very large files
-        const roughStatements = sqlContent.split(/;[\s\n]*/).map((s)=>s.trim()).filter((s)=>s.length > 0);
-        const validStatements = [];
-        for (const stmt of roughStatements){
-            // Add semicolon back
-            const fullStmt = stmt + ';';
-            // Skip comments-only statements
-            if (!stmt.trim().startsWith('--') && '' !== stmt.trim()) // Validate with parser (but don't fail if it can't parse complex statements)
-            try {
-                parser.astify(fullStmt, opt);
-                validStatements.push(fullStmt);
-            } catch (parseError) {
-                // If parser can't handle it, include it anyway if it looks like valid SQL
-                // This handles complex statements like CREATE TRIGGER, CREATE VIEW with subqueries
-                if (stmt.match(/^(CREATE|ALTER|DROP|INSERT|UPDATE|DELETE|SELECT|PRAGMA)/i)) validStatements.push(fullStmt);
-                else console.warn(`Skipping potentially invalid statement: ${stmt.substring(0, 50)}...`);
-            }
-        }
-        return validStatements;
-    } catch (error) {
-        console.warn('node-sql-parser failed, using fallback parser:', error);
-        // Fallback to original simple parser
-        return splitStatements(sqlContent);
-    }
-}
 /**
  * Split SQL content into individual statements
- * Handles comments, quotes, and semicolons properly
+ * Handles comments, quotes, semicolons, and BEGIN...END blocks properly
  */ function splitStatements(sqlContent) {
     const statements = [];
     let currentStatement = '';
     let inQuote = false;
     let quoteChar = '';
+    let beginEndDepth = 0;
     const lines = sqlContent.split('\n');
     for (const line of lines){
         let processedLine = '';
+        const lineWithoutComments = line.replace(/--.*$/, '');
+        // Track BEGIN...END depth for this line BEFORE processing characters
+        if (!inQuote && lineWithoutComments.trim()) {
+            const beginMatches = lineWithoutComments.match(/\bBEGIN\b/gi);
+            const endMatches = lineWithoutComments.match(/\bEND\b/gi);
+            if (beginMatches) beginEndDepth += beginMatches.length;
+            if (endMatches) {
+                beginEndDepth -= endMatches.length;
+                if (beginEndDepth < 0) beginEndDepth = 0;
+            }
+        }
         for(let i = 0; i < line.length; i++){
             const char = line[i];
             const prevChar = i > 0 ? line[i - 1] : '';
@@ -1532,11 +1555,11 @@ const external_node_sql_parser_namespaceObject = require("node-sql-parser");
                 }
             }
             processedLine += char;
-            // Split on semicolon when not in quotes
-            if (';' === char && !inQuote) {
+            // Split on semicolon when not in quotes AND not inside BEGIN...END
+            if (';' === char && !inQuote && 0 === beginEndDepth) {
                 currentStatement += processedLine;
                 const stmt = currentStatement.trim();
-                if (stmt) statements.push(stmt);
+                if (stmt && !stmt.startsWith('--')) statements.push(stmt);
                 currentStatement = '';
                 processedLine = '';
             }
@@ -1545,7 +1568,7 @@ const external_node_sql_parser_namespaceObject = require("node-sql-parser");
     }
     // Handle remaining statement
     const finalStmt = currentStatement.trim();
-    if (finalStmt) statements.push(finalStmt);
+    if (finalStmt && !finalStmt.startsWith('--')) statements.push(finalStmt);
     return statements;
 }
 /**

package/dist/index.js

@@ -1,6 +1,5 @@
 import * as __WEBPACK_EXTERNAL_MODULE_bun_sqlite__ from "bun:sqlite";
 import * as __WEBPACK_EXTERNAL_MODULE__libsql_client__ from "@libsql/client";
-import * as __WEBPACK_EXTERNAL_MODULE_node_sql_parser__ from "node-sql-parser";
 import * as __WEBPACK_EXTERNAL_MODULE_node_fs__ from "node:fs";
 // Core types for the ODBLite client
 // Error types
@@ -1047,26 +1046,41 @@ ODBLiteClient.join;
     }
     /**
    * Template tag query (postgres.js-like)
-   */ async query(strings, ...values) {
+   */ async sql(strings, ...values) {
         // Build SQL from template
-        const sql = strings.reduce((acc, str, i)=>acc + str + (i < values.length ? '?' : ''), '');
-        return this.execute(sql, values);
+        const sqlStr = strings.reduce((acc, str, i)=>acc + str + (i < values.length ? '?' : ''), '');
+        return this.execute(sqlStr, values);
+    }
+    /**
+   * Query with SQL string and parameters (alias for execute)
+   */ async query(sql, params = []) {
+        return this.execute(sql, params);
     }
     /**
    * Execute SQL with parameters
    */ async execute(sql, params = []) {
         try {
-            const stmt = this.db.query(sql);
-            const isSelect = sql.trim().toUpperCase().startsWith('SELECT');
+            // Handle object format { sql, args }
+            let sqlStr;
+            let sqlParams;
+            if ('object' == typeof sql) {
+                sqlStr = sql.sql;
+                sqlParams = sql.args || [];
+            } else {
+                sqlStr = sql;
+                sqlParams = params;
+            }
+            const stmt = this.db.query(sqlStr);
+            const isSelect = sqlStr.trim().toUpperCase().startsWith('SELECT') || sqlStr.trim().toUpperCase().includes('RETURNING');
             if (isSelect) {
-                const rows = stmt.all(...params);
+                const rows = stmt.all(...sqlParams);
                 return {
                     rows: rows,
                     rowsAffected: 0
                 };
             }
             {
-                const result = stmt.run(...params);
+                const result = stmt.run(...sqlParams);
                 return {
                     rows: [],
                     rowsAffected: result.changes || 0,
@@ -1123,6 +1137,11 @@ ODBLiteClient.join;
         }
     }
     /**
+   * Execute function in transaction (alias for transaction)
+   */ async begin(fn) {
+        return this.transaction(fn);
+    }
+    /**
    * Close connection
    */ async close() {
         this.db.close();
@@ -1172,10 +1191,15 @@ ODBLiteClient.join;
     }
     /**
    * Template tag query (postgres.js-like)
-   */ async query(strings, ...values) {
+   */ async sql(strings, ...values) {
         // Build SQL from template
-        const sql = strings.reduce((acc, str, i)=>acc + str + (i < values.length ? '?' : ''), '');
-        return this.execute(sql, values);
+        const sqlStr = strings.reduce((acc, str, i)=>acc + str + (i < values.length ? '?' : ''), '');
+        return this.execute(sqlStr, values);
+    }
+    /**
+   * Query with SQL string and parameters (alias for execute)
+   */ async query(sql, params = []) {
+        return this.execute(sql, params);
     }
     /**
    * Execute SQL with parameters
@@ -1234,6 +1258,11 @@ ODBLiteClient.join;
         }
     }
     /**
+   * Execute function in transaction (alias for transaction)
+   */ async begin(fn) {
+        return this.transaction(fn);
+    }
+    /**
    * Close connection
    */ async close() {
     // LibSQL client.close() if available in future versions
@@ -1306,7 +1335,7 @@ ODBLiteClient.join;
     }
     /**
    * Template tag query (postgres.js-like)
-   */ async query(strings, ...values) {
+   */ async sql(strings, ...values) {
         // ODBLiteClient.sql is a function that returns a Promise
         const result = await this.client.sql(strings, ...values);
         return {
@@ -1315,9 +1344,23 @@ ODBLiteClient.join;
         };
     }
     /**
+   * Query with SQL string and parameters (alias for execute)
+   */ async query(sql, params = []) {
+        return this.execute(sql, params);
+    }
+    /**
    * Execute SQL with parameters
    */ async execute(sql, params = []) {
         try {
+            // Handle object format { sql, args }
+            if ('object' == typeof sql) {
+                const result = await this.client.sql.execute(sql.sql, sql.args || []);
+                return {
+                    rows: result.rows,
+                    rowsAffected: result.rowsAffected || 0
+                };
+            }
+            // Handle string format
             const result = await this.client.sql.execute(sql, params);
             return {
                 rows: result.rows,
@@ -1361,6 +1404,11 @@ ODBLiteClient.join;
         }
     }
     /**
+   * Execute function in transaction (alias for transaction)
+   */ async begin(fn) {
+        return this.transaction(fn);
+    }
+    /**
    * Close connection
    */ async close() {
     // ODBLiteClient connections are stateless HTTP requests
@@ -1369,11 +1417,11 @@ ODBLiteClient.join;
 }
 /**
  * Parse SQL file into statements, separating PRAGMA from regular SQL
- * Uses node-sql-parser for robust SQL parsing
+ * Uses custom parser that handles BEGIN...END blocks
  */ function parseSQL(sqlContent, options = {}) {
     const separatePragma = options.separatePragma ?? true;
-    // Use node-sql-parser to properly split SQL statements
-    const statements = splitStatementsWithParser(sqlContent);
+    // Split SQL statements manually
+    const statements = splitStatements(sqlContent);
     if (!separatePragma) return {
         pragmaStatements: [],
         regularStatements: statements
@@ -1390,54 +1438,29 @@ ODBLiteClient.join;
         regularStatements
     };
 }
-/**
- * Split SQL content using node-sql-parser (more robust than custom parser)
- * Falls back to simple split if parser fails
- */ function splitStatementsWithParser(sqlContent) {
-    try {
-        const parser = new __WEBPACK_EXTERNAL_MODULE_node_sql_parser__.Parser();
-        // node-sql-parser supports splitting multiple statements
-        // Try to use it, but have fallback for edge cases
-        const opt = {
-            database: 'sqlite',
-            type: 'table'
-        };
-        // Split by semicolons first to handle parser limitations with very large files
-        const roughStatements = sqlContent.split(/;[\s\n]*/).map((s)=>s.trim()).filter((s)=>s.length > 0);
-        const validStatements = [];
-        for (const stmt of roughStatements){
-            // Add semicolon back
-            const fullStmt = stmt + ';';
-            // Skip comments-only statements
-            if (!stmt.trim().startsWith('--') && '' !== stmt.trim()) // Validate with parser (but don't fail if it can't parse complex statements)
-            try {
-                parser.astify(fullStmt, opt);
-                validStatements.push(fullStmt);
-            } catch (parseError) {
-                // If parser can't handle it, include it anyway if it looks like valid SQL
-                // This handles complex statements like CREATE TRIGGER, CREATE VIEW with subqueries
-                if (stmt.match(/^(CREATE|ALTER|DROP|INSERT|UPDATE|DELETE|SELECT|PRAGMA)/i)) validStatements.push(fullStmt);
-                else console.warn(`Skipping potentially invalid statement: ${stmt.substring(0, 50)}...`);
-            }
-        }
-        return validStatements;
-    } catch (error) {
-        console.warn('node-sql-parser failed, using fallback parser:', error);
-        // Fallback to original simple parser
-        return splitStatements(sqlContent);
-    }
-}
 /**
  * Split SQL content into individual statements
- * Handles comments, quotes, and semicolons properly
+ * Handles comments, quotes, semicolons, and BEGIN...END blocks properly
  */ function splitStatements(sqlContent) {
     const statements = [];
     let currentStatement = '';
     let inQuote = false;
     let quoteChar = '';
+    let beginEndDepth = 0;
     const lines = sqlContent.split('\n');
     for (const line of lines){
         let processedLine = '';
+        const lineWithoutComments = line.replace(/--.*$/, '');
+        // Track BEGIN...END depth for this line BEFORE processing characters
+        if (!inQuote && lineWithoutComments.trim()) {
+            const beginMatches = lineWithoutComments.match(/\bBEGIN\b/gi);
+            const endMatches = lineWithoutComments.match(/\bEND\b/gi);
+            if (beginMatches) beginEndDepth += beginMatches.length;
+            if (endMatches) {
+                beginEndDepth -= endMatches.length;
+                if (beginEndDepth < 0) beginEndDepth = 0;
+            }
+        }
         for(let i = 0; i < line.length; i++){
             const char = line[i];
             const prevChar = i > 0 ? line[i - 1] : '';
@@ -1457,11 +1480,11 @@ ODBLiteClient.join;
                 }
             }
             processedLine += char;
-            // Split on semicolon when not in quotes
-            if (';' === char && !inQuote) {
+            // Split on semicolon when not in quotes AND not inside BEGIN...END
+            if (';' === char && !inQuote && 0 === beginEndDepth) {
                 currentStatement += processedLine;
                 const stmt = currentStatement.trim();
-                if (stmt) statements.push(stmt);
+                if (stmt && !stmt.startsWith('--')) statements.push(stmt);
                 currentStatement = '';
                 processedLine = '';
             }
@@ -1470,7 +1493,7 @@ ODBLiteClient.join;
     }
     // Handle remaining statement
     const finalStmt = currentStatement.trim();
-    if (finalStmt) statements.push(finalStmt);
+    if (finalStmt && !finalStmt.startsWith('--')) statements.push(finalStmt);
     return statements;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pineliner/odb-client",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Isomorphic client for ODB-Lite with postgres.js-like template string SQL support",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

package/src/database/adapters/bun-sqlite.ts

@@ -62,34 +62,54 @@ class BunSQLiteConnection implements Connection {
   /**
    * Template tag query (postgres.js-like)
    */
-  async query<T = any>(
+  async sql<T = any>(
     strings: TemplateStringsArray,
     ...values: any[]
   ): Promise<QueryResult<T>> {
     // Build SQL from template
-    const sql = strings.reduce((acc, str, i) => {
+    const sqlStr = strings.reduce((acc, str, i) => {
       return acc + str + (i < values.length ? '?' : '')
     }, '')
 
-    return this.execute(sql, values)
+    return this.execute(sqlStr, values) as Promise<QueryResult<T>>
+  }
+
+  /**
+   * Query with SQL string and parameters (alias for execute)
+   */
+  async query<T = any>(sql: string, params: any[] = []): Promise<QueryResult<T>> {
+    return this.execute(sql, params) as Promise<QueryResult<T>>
   }
 
   /**
    * Execute SQL with parameters
    */
-  async execute(sql: string, params: any[] = []): Promise<QueryResult> {
+  async execute(sql: string | { sql: string; args?: any[] }, params: any[] = []): Promise<QueryResult> {
     try {
-      const stmt = this.db.query(sql)
-      const isSelect = sql.trim().toUpperCase().startsWith('SELECT')
+      // Handle object format { sql, args }
+      let sqlStr: string
+      let sqlParams: any[]
+
+      if (typeof sql === 'object') {
+        sqlStr = sql.sql
+        sqlParams = sql.args || []
+      } else {
+        sqlStr = sql
+        sqlParams = params
+      }
+
+      const stmt = this.db.query(sqlStr)
+      const isSelect = sqlStr.trim().toUpperCase().startsWith('SELECT') ||
+                       sqlStr.trim().toUpperCase().includes('RETURNING')
 
       if (isSelect) {
-        const rows = stmt.all(...params)
+        const rows = stmt.all(...sqlParams)
         return {
           rows: rows as any[],
           rowsAffected: 0,
         }
       } else {
-        const result = stmt.run(...params)
+        const result = stmt.run(...sqlParams)
         return {
           rows: [],
           rowsAffected: result.changes || 0,
@@ -161,6 +181,13 @@ class BunSQLiteConnection implements Connection {
     }
   }
 
+  /**
+   * Execute function in transaction (alias for transaction)
+   */
+  async begin<T>(fn: (tx: Connection) => Promise<T>): Promise<T> {
+    return this.transaction(fn)
+  }
+
   /**
    * Close connection
    */

package/src/database/adapters/libsql.ts

@@ -62,16 +62,23 @@ class LibSQLConnection implements Connection {
   /**
    * Template tag query (postgres.js-like)
    */
-  async query<T = any>(
+  async sql<T = any>(
     strings: TemplateStringsArray,
     ...values: any[]
   ): Promise<QueryResult<T>> {
     // Build SQL from template
-    const sql = strings.reduce((acc, str, i) => {
+    const sqlStr = strings.reduce((acc, str, i) => {
       return acc + str + (i < values.length ? '?' : '')
     }, '')
 
-    return this.execute(sql, values)
+    return this.execute(sqlStr, values) as Promise<QueryResult<T>>
+  }
+
+  /**
+   * Query with SQL string and parameters (alias for execute)
+   */
+  async query<T = any>(sql: string, params: any[] = []): Promise<QueryResult<T>> {
+    return this.execute(sql, params) as Promise<QueryResult<T>>
   }
 
   /**
@@ -146,6 +153,13 @@ class LibSQLConnection implements Connection {
     }
   }
 
+  /**
+   * Execute function in transaction (alias for transaction)
+   */
+  async begin<T>(fn: (tx: Connection) => Promise<T>): Promise<T> {
+    return this.transaction(fn)
+  }
+
   /**
    * Close connection
    */

package/src/database/adapters/odblite.ts

@@ -97,7 +97,7 @@ class ODBLiteConnection implements Connection {
   /**
    * Template tag query (postgres.js-like)
    */
-  async query<T = any>(
+  async sql<T = any>(
     strings: TemplateStringsArray,
     ...values: any[]
   ): Promise<QueryResult<T>> {
@@ -110,11 +110,28 @@ class ODBLiteConnection implements Connection {
     }
   }
 
+  /**
+   * Query with SQL string and parameters (alias for execute)
+   */
+  async query<T = any>(sql: string, params: any[] = []): Promise<QueryResult<T>> {
+    return this.execute(sql, params) as Promise<QueryResult<T>>
+  }
+
   /**
    * Execute SQL with parameters
    */
-  async execute(sql: string, params: any[] = []): Promise<QueryResult> {
+  async execute(sql: string | { sql: string; args?: any[] }, params: any[] = []): Promise<QueryResult> {
     try {
+      // Handle object format { sql, args }
+      if (typeof sql === 'object') {
+        const result = await this.client.sql.execute(sql.sql, sql.args || [])
+        return {
+          rows: result.rows,
+          rowsAffected: result.rowsAffected || 0,
+        }
+      }
+
+      // Handle string format
       const result = await this.client.sql.execute(sql, params)
 
       return {
@@ -171,6 +188,13 @@ class ODBLiteConnection implements Connection {
     }
   }
 
+  /**
+   * Execute function in transaction (alias for transaction)
+   */
+  async begin<T>(fn: (tx: Connection) => Promise<T>): Promise<T> {
+    return this.transaction(fn)
+  }
+
   /**
    * Close connection
    */

package/src/database/sql-parser.ts

@@ -1,5 +1,3 @@
-import { Parser } from 'node-sql-parser'
-
 export interface ParsedStatements {
   pragmaStatements: string[]
   regularStatements: string[]
@@ -11,13 +9,13 @@ export interface SQLParserOptions {
 
 /**
  * Parse SQL file into statements, separating PRAGMA from regular SQL
- * Uses node-sql-parser for robust SQL parsing
+ * Uses custom parser that handles BEGIN...END blocks
  */
 export function parseSQL(sqlContent: string, options: SQLParserOptions = {}): ParsedStatements {
   const separatePragma = options.separatePragma ?? true
 
-  // Use node-sql-parser to properly split SQL statements
-  const statements = splitStatementsWithParser(sqlContent)
+  // Split SQL statements manually
+  const statements = splitStatements(sqlContent)
 
   if (!separatePragma) {
     return {
@@ -41,74 +39,38 @@ export function parseSQL(sqlContent: string, options: SQLParserOptions = {}): Pa
   return { pragmaStatements, regularStatements }
 }
 
-/**
- * Split SQL content using node-sql-parser (more robust than custom parser)
- * Falls back to simple split if parser fails
- */
-function splitStatementsWithParser(sqlContent: string): string[] {
-  try {
-    const parser = new Parser()
-
-    // node-sql-parser supports splitting multiple statements
-    // Try to use it, but have fallback for edge cases
-    const opt = {
-      database: 'sqlite',
-      type: 'table' as any
-    }
-
-    // Split by semicolons first to handle parser limitations with very large files
-    const roughStatements = sqlContent.split(/;[\s\n]*/)
-      .map(s => s.trim())
-      .filter(s => s.length > 0)
-
-    const validStatements: string[] = []
-
-    for (const stmt of roughStatements) {
-      // Add semicolon back
-      const fullStmt = stmt + ';'
-
-      // Skip comments-only statements
-      if (stmt.trim().startsWith('--') || stmt.trim() === '') {
-        continue
-      }
-
-      // Validate with parser (but don't fail if it can't parse complex statements)
-      try {
-        parser.astify(fullStmt, opt)
-        validStatements.push(fullStmt)
-      } catch (parseError) {
-        // If parser can't handle it, include it anyway if it looks like valid SQL
-        // This handles complex statements like CREATE TRIGGER, CREATE VIEW with subqueries
-        if (stmt.match(/^(CREATE|ALTER|DROP|INSERT|UPDATE|DELETE|SELECT|PRAGMA)/i)) {
-          validStatements.push(fullStmt)
-        } else {
-          console.warn(`Skipping potentially invalid statement: ${stmt.substring(0, 50)}...`)
-        }
-      }
-    }
-
-    return validStatements
-  } catch (error) {
-    console.warn('node-sql-parser failed, using fallback parser:', error)
-    // Fallback to original simple parser
-    return splitStatements(sqlContent)
-  }
-}
-
 /**
  * Split SQL content into individual statements
- * Handles comments, quotes, and semicolons properly
+ * Handles comments, quotes, semicolons, and BEGIN...END blocks properly
  */
 function splitStatements(sqlContent: string): string[] {
   const statements: string[] = []
   let currentStatement = ''
   let inQuote = false
   let quoteChar = ''
+  let beginEndDepth = 0
 
   const lines = sqlContent.split('\n')
 
   for (const line of lines) {
     let processedLine = ''
+    const lineWithoutComments = line.replace(/--.*$/, '')
+
+    // Track BEGIN...END depth for this line BEFORE processing characters
+    if (!inQuote && lineWithoutComments.trim()) {
+      const beginMatches = lineWithoutComments.match(/\bBEGIN\b/gi)
+      const endMatches = lineWithoutComments.match(/\bEND\b/gi)
+
+      if (beginMatches) {
+        beginEndDepth += beginMatches.length
+      }
+      if (endMatches) {
+        beginEndDepth -= endMatches.length
+        if (beginEndDepth < 0) {
+          beginEndDepth = 0
+        }
+      }
+    }
 
     for (let i = 0; i < line.length; i++) {
       const char = line[i]
@@ -133,11 +95,11 @@ function splitStatements(sqlContent: string): string[] {
 
       processedLine += char
 
-      // Split on semicolon when not in quotes
-      if (char === ';' && !inQuote) {
+      // Split on semicolon when not in quotes AND not inside BEGIN...END
+      if (char === ';' && !inQuote && beginEndDepth === 0) {
         currentStatement += processedLine
         const stmt = currentStatement.trim()
-        if (stmt) {
+        if (stmt && !stmt.startsWith('--')) {
           statements.push(stmt)
         }
         currentStatement = ''
@@ -152,7 +114,7 @@ function splitStatements(sqlContent: string): string[] {
 
   // Handle remaining statement
   const finalStmt = currentStatement.trim()
-  if (finalStmt) {
+  if (finalStmt && !finalStmt.startsWith('--')) {
     statements.push(finalStmt)
   }
 

package/src/database/types.ts

@@ -31,14 +31,16 @@ export interface QueryResult<T = any> {
  */
 export interface Connection {
   // Template tag queries (postgres.js-like)
-  query<T = any>(strings: TemplateStringsArray, ...values: any[]): Promise<QueryResult<T>>
+  sql<T = any>(strings: TemplateStringsArray, ...values: any[]): Promise<QueryResult<T>>
 
-  // Standard query methods (supports both formats for LibSQL compatibility)
+  // Standard query methods (same as execute)
+  query<T = any>(sql: string, params?: any[]): Promise<QueryResult<T>>
   execute(sql: string | { sql: string; args?: any[] }, params?: any[]): Promise<QueryResult>
   prepare(sql: string): PreparedStatement
 
   // Transaction support
   transaction<T>(fn: (tx: Connection) => Promise<T>): Promise<T>
+  begin<T>(fn: (tx: Connection) => Promise<T>): Promise<T>
 
   // Connection management
   close(): Promise<void>