@pineliner/odb-client 1.0.2 → 1.0.4

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

@@ -7,7 +7,7 @@ export interface SQLParserOptions {
 }
 /**
  * Parse SQL file into statements, separating PRAGMA from regular SQL
- * Handles comments, quotes, and semicolons properly
+ * 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":"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;AAkED;;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/index.cjs

@@ -1443,10 +1443,10 @@ const external_libsql_client_namespaceObject = require("@libsql/client");
 }
 /**
  * Parse SQL file into statements, separating PRAGMA from regular SQL
- * Handles comments, quotes, and semicolons properly
+ * Uses custom parser that handles BEGIN...END blocks
  */ function parseSQL(sqlContent, options = {}) {
     const separatePragma = options.separatePragma ?? true;
-    // Split by semicolons (node-sql-parser doesn't handle multiple statements well)
+    // Split SQL statements manually
     const statements = splitStatements(sqlContent);
     if (!separatePragma) return {
         pragmaStatements: [],
@@ -1466,15 +1466,27 @@ const external_libsql_client_namespaceObject = require("@libsql/client");
 }
 /**
  * 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] : '';
@@ -1494,11 +1506,11 @@ const external_libsql_client_namespaceObject = require("@libsql/client");
                 }
             }
             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 = '';
             }
@@ -1507,7 +1519,7 @@ const external_libsql_client_namespaceObject = require("@libsql/client");
     }
     // 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

@@ -1368,10 +1368,10 @@ ODBLiteClient.join;
 }
 /**
  * Parse SQL file into statements, separating PRAGMA from regular SQL
- * Handles comments, quotes, and semicolons properly
+ * Uses custom parser that handles BEGIN...END blocks
  */ function parseSQL(sqlContent, options = {}) {
     const separatePragma = options.separatePragma ?? true;
-    // Split by semicolons (node-sql-parser doesn't handle multiple statements well)
+    // Split SQL statements manually
     const statements = splitStatements(sqlContent);
     if (!separatePragma) return {
         pragmaStatements: [],
@@ -1391,15 +1391,27 @@ ODBLiteClient.join;
 }
 /**
  * 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] : '';
@@ -1419,11 +1431,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 = '';
             }
@@ -1432,7 +1444,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.2",
+  "version": "1.0.4",
   "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/sql-parser.ts

@@ -9,12 +9,12 @@ export interface SQLParserOptions {
 
 /**
  * Parse SQL file into statements, separating PRAGMA from regular SQL
- * Handles comments, quotes, and semicolons properly
+ * Uses custom parser that handles BEGIN...END blocks
  */
 export function parseSQL(sqlContent: string, options: SQLParserOptions = {}): ParsedStatements {
   const separatePragma = options.separatePragma ?? true
 
-  // Split by semicolons (node-sql-parser doesn't handle multiple statements well)
+  // Split SQL statements manually
   const statements = splitStatements(sqlContent)
 
   if (!separatePragma) {
@@ -41,18 +41,36 @@ export function parseSQL(sqlContent: string, options: SQLParserOptions = {}): Pa
 
 /**
  * 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]
@@ -77,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 = ''
@@ -96,7 +114,7 @@ function splitStatements(sqlContent: string): string[] {
 
   // Handle remaining statement
   const finalStmt = currentStatement.trim()
-  if (finalStmt) {
+  if (finalStmt && !finalStmt.startsWith('--')) {
     statements.push(finalStmt)
   }