@pineliner/odb-client 1.0.3 → 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
- * 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/index.cjs

@@ -1441,14 +1441,13 @@ const external_libsql_client_namespaceObject = require("@libsql/client");
     // 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 +1464,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 +1506,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 +1519,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
@@ -1369,11 +1368,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 +1389,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 +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 = '';
             }
@@ -1470,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.3",
+  "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

@@ -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)
   }