spine-framework 0.2.6 → 0.2.8

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

@@ -99,64 +99,40 @@ async function migrateCommand(options: MigrateOptions): Promise<void> {
     // 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 += sql[i]
-        i++
-      }
-
-      // 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 dollarBlocks: string[] = []
+      let blockIndex = 0
+
+      // Step 1: Protect dollar-quoted blocks with placeholders (preserves internal semicolons)
+      const protectedSql = sql.replace(/\$[A-Za-z_]*\$[\s\S]*?\$[A-Za-z_]*\$/g, (match) => {
+        const placeholder = `__DOLLAR_BLOCK_${blockIndex}__`
+        dollarBlocks[blockIndex] = match
+        blockIndex++
+        return placeholder
+      })
+
+      // Step 2: Strip single-line comments (prevents semicolons inside -- comments
+      //         from being treated as statement terminators)
+      const noComments = protectedSql.replace(/--[^\n]*/g, '')
+
+      // Step 3: Split by semicolons, restore dollar blocks, and filter empty statements
+      return noComments
+        .split(';')
+        .map(s => {
+          let restored = s.trim()
+          // Use function form of replace — prevents JS from interpreting $$ as $
+          dollarBlocks.forEach((block, idx) => {
+            restored = restored.replace(`__DOLLAR_BLOCK_${idx}__`, () => block)
+          })
+          return restored
+        })
+        .filter(s => s.length > 0)
+        .map(s => s + ';')
     }
 
     const statements = splitSqlStatements(sql)
 
     try {
-      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, ' ')}...`)
-        }
+      for (const stmt of statements) {
         await client.query(stmt)
       }
       console.log('✓')

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;AAsKxC,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;AA8IxC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,QAevD"}

package/package.json

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