spine-framework 0.3.72 → 0.3.74

package/.framework/cli/commands/install-app.ts

@@ -23,6 +23,7 @@ import { resolve, dirname, join, basename } from 'path'
 import { fileURLToPath } from 'url'
 import { execSync } from 'child_process'
 import { createClient } from '@supabase/supabase-js'
+import { runMigrations } from './migrate.js'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
@@ -85,12 +86,30 @@ export function registerInstallAppCommands(program: Command) {
         }
         console.log(`  ✓ App files copied to custom/apps/${appSlug}/`)
 
-        // 5. Seed types, roles, link-types into database
+        // 5. Run pending migrations before seeding so schema is up to date
+        console.log('  Running migrations...')
+        try {
+          const migrateResult = await runMigrations({ frameworkOnly: false })
+          if (migrateResult === null) {
+            console.log('  ○ Skipping migrations (SUPABASE_DB_PASSWORD not set)')
+          } else if (migrateResult.applied > 0) {
+            console.log(`  ✓ Migrations: ${migrateResult.applied} applied, ${migrateResult.skipped} skipped`)
+          } else {
+            console.log(`  ✓ Migrations: up to date (${migrateResult.skipped} already applied)`)
+          }
+          if (migrateResult && migrateResult.failed > 0) {
+            console.warn(`  ⚠ ${migrateResult.failed} migration(s) failed — seed may fail`)
+          }
+        } catch (migrateErr: any) {
+          console.warn(`  ⚠ Migration error: ${migrateErr.message} — continuing with seed`)
+        }
+
+        // 6. Seed types, roles, link-types into database
         if (!opts.seed === false) {
           await seedApp(appDest, appSlug)
         }
 
-        // 6. Aggregate registration config from manifest into spine.config.json
+        // 7. Aggregate registration config from manifest into spine.config.json
         const manifestPath = join(appDest, 'manifest.json')
         let manifest: Record<string, any> = {}
         try { manifest = JSON.parse(readFileSync(manifestPath, 'utf8')) } catch {}

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

@@ -35,62 +35,32 @@ interface MigrateOptions {
   frameworkOnly: boolean
 }
 
-async function migrateCommand(options: MigrateOptions): Promise<void> {
-  console.log('\nRunning Spine Framework migrations...\n')
-
-  // Load .env from project root
-  loadEnv()
-
+/**
+ * Run all pending migrations programmatically.
+ * Returns { applied, skipped, failed } — throws on connection failure.
+ * Silent on missing SUPABASE_DB_PASSWORD (returns null to indicate skipped).
+ */
+export async function runMigrations(opts: { frameworkOnly?: boolean } = {}): Promise<{ applied: number; skipped: number; failed: number } | null> {
   const supabaseUrl = process.env.SUPABASE_URL
   if (!supabaseUrl || supabaseUrl.includes('placeholder') || supabaseUrl.includes('your-project')) {
-    console.error('Error: SUPABASE_URL not set. Edit your .env file first.')
-    console.error('  Get it from: https://supabase.com/dashboard/project/_/settings/api')
-    process.exit(1)
+    return null
   }
 
-  const dbPassword = options.dbPassword || process.env.SUPABASE_DB_PASSWORD
+  const dbPassword = process.env.SUPABASE_DB_PASSWORD
   if (!dbPassword) {
-    console.error('Error: SUPABASE_DB_PASSWORD not set.')
-    console.error('  Add it to .env or pass --db-password <password>')
-    console.error('  Get it from: https://supabase.com/dashboard/project/_/settings/database')
-    process.exit(1)
+    return null
   }
 
   const projectRef = supabaseUrl.replace('https://', '').split('.')[0]
   const connectionString = `postgresql://postgres:${dbPassword}@db.${projectRef}.supabase.co:5432/postgres`
 
-  // Collect migration files
-  const migrationFiles = collectMigrations(options.frameworkOnly)
-
-  if (migrationFiles.length === 0) {
-    console.log('No migration files found.')
-    return
-  }
-
-  console.log(`  Found ${migrationFiles.length} migration file(s)\n`)
-
-  if (options.dryRun) {
-    for (const file of migrationFiles) {
-      console.log(`  [dry-run] Would apply: ${file.name}`)
-    }
-    console.log('\nDry run complete — no changes made.\n')
-    return
-  }
+  const migrationFiles = collectMigrations(opts.frameworkOnly ?? false)
+  if (migrationFiles.length === 0) return { applied: 0, skipped: 0, failed: 0 }
 
-  // Dynamically import pg to avoid loading it at module init time
   const { default: pg } = await import('pg')
   const client = new pg.Client({ connectionString })
+  await client.connect()
 
-  try {
-    await client.connect()
-    console.log('  Connected to database\n')
-  } catch (err: any) {
-    console.error(`Error: Could not connect to database: ${err.message}`)
-    console.error('  Check your SUPABASE_DB_PASSWORD and that the project is active.')
-    process.exit(1)
-  }
-
-  // Create migration tracking table if it doesn't exist
   try {
     await client.query(`
       CREATE TABLE IF NOT EXISTS _spine_migrations (
@@ -99,40 +69,28 @@ async function migrateCommand(options: MigrateOptions): Promise<void> {
         applied_at TIMESTAMPTZ DEFAULT NOW()
       )
     `)
-  } catch {
-    // Non-fatal: proceed without tracking
-  }
+  } catch { /* non-fatal */ }
 
-  // Load already-applied migrations
   let appliedMigrations = new Set<string>()
   try {
     const { rows } = await client.query('SELECT filename FROM _spine_migrations')
     appliedMigrations = new Set(rows.map((r: { filename: string }) => r.filename))
-  } catch {
-    // Non-fatal: proceed without tracking
-  }
+  } catch { /* non-fatal */ }
 
-  let applied = 0
-  let skipped = 0
-  let failed = 0
+  let applied = 0, skipped = 0, failed = 0
 
   for (const { name, path } of migrationFiles) {
     if (appliedMigrations.has(name)) {
-      console.log(`  Skipping ${name} (already applied)`)
       skipped++
       continue
     }
 
     const sql = readFileSync(path, 'utf8')
     process.stdout.write(`  Applying ${name}... `)
-
     const statements = splitSqlStatements(sql)
 
     try {
-      for (const stmt of statements) {
-        await client.query(stmt)
-      }
-      // Record as applied
+      for (const stmt of statements) await client.query(stmt)
       await client.query(
         `INSERT INTO _spine_migrations (filename) VALUES ($1) ON CONFLICT (filename) DO NOTHING`,
         [name]
@@ -147,10 +105,60 @@ async function migrateCommand(options: MigrateOptions): Promise<void> {
   }
 
   await client.end()
+  return { applied, skipped, failed }
+}
+
+async function migrateCommand(options: MigrateOptions): Promise<void> {
+  console.log('\nRunning Spine Framework migrations...\n')
+
+  // Load .env from project root
+  loadEnv()
+
+  const supabaseUrl = process.env.SUPABASE_URL
+  if (!supabaseUrl || supabaseUrl.includes('placeholder') || supabaseUrl.includes('your-project')) {
+    console.error('Error: SUPABASE_URL not set. Edit your .env file first.')
+    console.error('  Get it from: https://supabase.com/dashboard/project/_/settings/api')
+    process.exit(1)
+  }
+
+  const dbPassword = options.dbPassword || process.env.SUPABASE_DB_PASSWORD
+  if (!dbPassword) {
+    console.error('Error: SUPABASE_DB_PASSWORD not set.')
+    console.error('  Add it to .env or pass --db-password <password>')
+    console.error('  Get it from: https://supabase.com/dashboard/project/_/settings/database')
+    process.exit(1)
+  }
+
+  // Override env with CLI flag if provided
+  if (options.dbPassword) process.env.SUPABASE_DB_PASSWORD = options.dbPassword
+
+  const migrationFiles = collectMigrations(options.frameworkOnly)
+
+  if (migrationFiles.length === 0) {
+    console.log('No migration files found.')
+    return
+  }
+
+  console.log(`  Found ${migrationFiles.length} migration file(s)\n`)
+
+  if (options.dryRun) {
+    for (const file of migrationFiles) {
+      console.log(`  [dry-run] Would apply: ${file.name}`)
+    }
+    console.log('\nDry run complete — no changes made.\n')
+    return
+  }
+
+  const result = await runMigrations({ frameworkOnly: options.frameworkOnly })
+
+  if (!result) {
+    console.error('Could not connect: SUPABASE_URL or SUPABASE_DB_PASSWORD missing.')
+    process.exit(1)
+  }
 
-  console.log(`\n  ${applied} applied, ${skipped} skipped, ${failed} failed`)
+  console.log(`\n  ${result.applied} applied, ${result.skipped} skipped, ${result.failed} failed`)
 
-  if (failed > 0) {
+  if (result.failed > 0) {
     console.error('\nSome migrations failed. Check errors above.')
     process.exit(1)
   }

package/.framework/src/pages/auth/RegisterPage.tsx

@@ -209,6 +209,14 @@ export function RegisterPage() {
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
     setError('')
+
+    // Guard: if registration config hasn't loaded yet, block submission
+    // This prevents silently falling through to new_account when config is needed
+    if (!isFirstUser && !inviteToken && !regConfig) {
+      setError('Registration configuration not loaded. Please refresh and try again.')
+      return
+    }
+
     setIsLoading(true)
 
     try {
@@ -314,6 +322,9 @@ export function RegisterPage() {
           target_account: targetAccount,
           role_slug: effectiveRole,
         }, 'POST')
+      } else if (effectiveAccountStrategy === 'existing' && !targetAccount) {
+        // Misconfigured: existing strategy but no target account in spine.config.json
+        throw new Error('Registration misconfigured: account_strategy is "existing" but no target_account is set.')
       } else {
         // Create new account (personal or company)
         console.log('Using new_account path')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spine-framework",
-  "version": "0.3.72",
+  "version": "0.3.74",
   "description": "Multi-tenant, modular application platform for modern SaaS systems",
   "type": "module",
   "bin": {