spine-framework 0.2.4 → 0.2.6

package/.framework/cli/commands/migrate.ts

@@ -95,59 +95,69 @@ async function migrateCommand(options: MigrateOptions): Promise<void> {
     const sql = readFileSync(resolve(MIGRATIONS_DIR, file), 'utf8')
     process.stdout.write(`  Applying ${file}... `)
 
-    // Split into individual statements so each executes in its own round-trip.
-    // Running the whole file as one query string causes pg to abort the entire
-    // batch on the first error, preventing PL/pgSQL EXCEPTION handlers from
-    // catching expected errors like "relation already exists".
-    // MUST preserve dollar-quoted blocks ($$ ... $$) which contain semicolons.
-    const statements: string[] = []
-    let current = ''
-    let inDollarQuote = false
-    let dollarTag = ''
-    let i = 0
-    while (i < sql.length) {
-      if (!inDollarQuote) {
-        // Check for start of dollar quote: $tag$ or $$
-        const dollarMatch = sql.slice(i).match(/^(\$[A-Za-z_]*\$)/)
-        if (dollarMatch) {
-          inDollarQuote = true
-          dollarTag = dollarMatch[1]
-          current += dollarMatch[1]
-          i += dollarMatch[1].length
-          continue
-        }
-        // Check for statement terminator
-        if (sql[i] === ';') {
-          const stmt = current.trim()
-          if (stmt.length > 0 && !stmt.startsWith('--')) {
-            statements.push(stmt)
+    // Split SQL into statements, being careful to preserve dollar-quoted blocks.
+    // Dollar-quoted strings ($$ ... $$ or $tag$ ... $tag$) can contain semicolons
+    // that are NOT statement terminators.
+    function splitSqlStatements(sql: string): string[] {
+      const statements: string[] = []
+      let current = ''
+      let inDollarQuote = false
+      let dollarTag = ''
+      let i = 0
+
+      while (i < sql.length) {
+        if (!inDollarQuote) {
+          // Check for start of dollar quote: $tag$ or $$
+          const dollarMatch = sql.slice(i).match(/^(\$[A-Za-z_]*\$)/)
+          if (dollarMatch) {
+            inDollarQuote = true
+            dollarTag = dollarMatch[1]
+            current += dollarMatch[1]
+            i += dollarMatch[1].length
+            continue
+          }
+          // Check for statement terminator (semicolon outside dollar quote)
+          if (sql[i] === ';') {
+            const stmt = current.trim()
+            if (stmt.length > 0 && !stmt.startsWith('--')) {
+              statements.push(stmt + ';')
+            }
+            current = ''
+            i++
+            continue
+          }
+        } else {
+          // We're inside a dollar-quoted string
+          // Check for end of dollar quote
+          if (sql.slice(i, i + dollarTag.length) === dollarTag) {
+            inDollarQuote = false
+            current += dollarTag
+            i += dollarTag.length
+            continue
           }
-          current = ''
-          i++
-          continue
-        }
-      } else {
-        // Check for end of dollar quote
-        const endTag = dollarTag
-        if (sql.slice(i, i + endTag.length) === endTag) {
-          inDollarQuote = false
-          current += endTag
-          i += endTag.length
-          continue
         }
+        current += sql[i]
+        i++
       }
-      current += sql[i]
-      i++
-    }
-    // Don't forget the last statement
-    const last = current.trim()
-    if (last.length > 0 && !last.startsWith('--')) {
-      statements.push(last)
+
+      // Don't forget the last statement (might not have trailing semicolon)
+      const last = current.trim()
+      if (last.length > 0 && !last.startsWith('--')) {
+        statements.push(last + (last.endsWith(';') ? '' : ';'))
+      }
+
+      return statements
     }
 
+    const statements = splitSqlStatements(sql)
+
     try {
-      for (const stmt of statements) {
-        await client.query(stmt + ';')
+      for (let i = 0; i < statements.length; i++) {
+        const stmt = statements[i]
+        if (process.env.SPINE_DEBUG_MIGRATE) {
+          console.log(`\n    [${i + 1}/${statements.length}] ${stmt.substring(0, 60).replace(/\n/g, ' ')}...`)
+        }
+        await client.query(stmt)
       }
       console.log('✓')
       applied++

package/dist/cli/commands/migrate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../.framework/cli/commands/migrate.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AA4JxC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,QAevD"}
+{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../.framework/cli/commands/migrate.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAsKxC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,QAevD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spine-framework",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "private": false,
   "description": "Spine — enterprise application framework built on Supabase + Netlify + React",
   "type": "module",