spine-framework 0.1.20 → 0.1.21

package/.framework/cli/commands/init.ts

@@ -30,9 +30,6 @@ const PACKAGE_ROOT = resolve(__dirname, '../../..')
 
 interface InitOptions {
   dryRun: boolean
-  url?: string
-  anonKey?: string
-  serviceRoleKey?: string
 }
 
 function scaffoldCustomWorkspace(dryRun: boolean): void {
@@ -58,33 +55,44 @@ function scaffoldCustomWorkspace(dryRun: boolean): void {
   }
 }
 
-function writeEnvFile(url: string, anonKey: string, serviceRoleKey: string, dryRun: boolean): void {
+function writeEnvFile(dryRun: boolean): void {
   const envPath = resolve(PROJECT_ROOT, '.env')
+
+  if (existsSync(envPath)) {
+    console.log('  ⏭️  .env already exists, skipping')
+    return
+  }
+
   const envContent = [
-    `VITE_SUPABASE_URL=${url}`,
-    `VITE_SUPABASE_ANON_KEY=${anonKey}`,
-    `SUPABASE_URL=${url}`,
-    `SUPABASE_ANON_KEY=${anonKey}`,
-    `SUPABASE_SERVICE_ROLE_KEY=${serviceRoleKey}`,
-    `VITE_APP_NAME=Spine`,
-    `DB_SCHEMA=public`,
+    '# ─── Supabase ────────────────────────────────────────────────────────────────',
+    '# Get these from: https://supabase.com/dashboard/project/_/settings/api',
+    'SUPABASE_URL=https://your-project.supabase.co',
+    'SUPABASE_ANON_KEY=your-anon-key',
+    'SUPABASE_SERVICE_ROLE_KEY=your-service-role-key',
+    '',
+    '# DB password for running migrations (direct Postgres connection)',
+    '# Get from: https://supabase.com/dashboard/project/_/settings/database',
+    'SUPABASE_DB_PASSWORD=your-db-password',
+    '',
+    '# ─── Vite / Frontend ─────────────────────────────────────────────────────────',
+    'VITE_SUPABASE_URL=https://your-project.supabase.co',
+    'VITE_SUPABASE_ANON_KEY=your-anon-key',
+    'VITE_APP_NAME=Spine',
+    '',
+    '# ─── OpenAI ──────────────────────────────────────────────────────────────────',
+    'OPENAI_API_KEY=your-openai-api-key',
+    '',
+    '# ─── App config ──────────────────────────────────────────────────────────────',
+    'DB_SCHEMA=public',
   ].join('\n') + '\n'
 
   if (dryRun) {
-    console.log(`  [dry-run] Would write .env with SUPABASE_URL=${url}`)
+    console.log('  [dry-run] Would write .env with placeholder values')
     return
   }
 
-  const existed = existsSync(envPath)
   writeFileSync(envPath, envContent, 'utf8')
-  console.log(`  ✓ ${existed ? 'Updated' : 'Created'} .env`)
-
-  // Also inject into process.env for the rest of this run
-  process.env.SUPABASE_URL = url
-  process.env.SUPABASE_ANON_KEY = anonKey
-  process.env.SUPABASE_SERVICE_ROLE_KEY = serviceRoleKey
-  process.env.VITE_SUPABASE_URL = url
-  process.env.VITE_SUPABASE_ANON_KEY = anonKey
+  console.log('  ✓ Created .env')
 }
 
 function copyFrameworkFiles(dryRun: boolean): void {
@@ -129,40 +137,30 @@ function copyFrameworkFiles(dryRun: boolean): void {
 async function initCommand(options: InitOptions): Promise<void> {
   console.log('\n🚀 Spine Framework — Init\n')
 
-  // Step 1: Write .env
-  if (options.url && options.anonKey && options.serviceRoleKey) {
-    console.log('🔑 Step 1: Writing environment configuration...')
-    writeEnvFile(options.url, options.anonKey, options.serviceRoleKey, options.dryRun)
-  } else if (!process.env.SUPABASE_URL) {
-    console.error('❌ No Supabase credentials found.')
-    console.error('   spine-framework init --url <url> --anon-key <key> --service-role-key <key>')
-    process.exit(1)
-  } else {
-    console.log('  ✓ Using existing .env credentials')
-  }
-
-  // Step 2: Copy framework files to project root
-  console.log('\n📦 Step 2: Installing framework files...')
+  // Step 1: Copy framework files to project root
+  console.log('📦 Step 1: Installing framework files...')
   copyFrameworkFiles(options.dryRun)
 
-  // Step 3: Scaffold custom workspace
-  console.log('\n📁 Step 3: Scaffolding custom workspace...')
+  // Step 2: Scaffold custom workspace
+  console.log('\n📁 Step 2: Scaffolding custom workspace...')
   scaffoldCustomWorkspace(options.dryRun)
 
+  // Step 3: Write .env with placeholders
+  console.log('\n🔑 Step 3: Writing environment configuration...')
+  writeEnvFile(options.dryRun)
+
   console.log('\n✅ Project initialized!')
-  console.log('\n   Next: apply database migrations:')
-  console.log('   npx spine-framework migrate --db-password <your-db-password>')
-  console.log('\n   Find your DB password at:')
-  console.log('   https://supabase.com/dashboard/project/_/settings/database')
+  console.log('\n   Next steps:')
+  console.log('   1. Fill in your Supabase credentials in .env')
+  console.log('      (get them from https://supabase.com/dashboard/project/_/settings/api)')
+  console.log('   2. Run: npx spine-framework migrate --db-password <your-db-password>')
+  console.log('      (get DB password from https://supabase.com/dashboard/project/_/settings/database)')
 }
 
 export function registerInitCommands(program: Command) {
   program
     .command('init')
-    .description('Write .env and scaffold the custom/ workspace (no DB changes)')
-    .option('--url <url>', 'Supabase project URL')
-    .option('--anon-key <key>', 'Supabase anon key')
-    .option('--service-role-key <key>', 'Supabase service role key')
+    .description('Install framework files, scaffold custom/ workspace, and write .env template')
     .option('--dry-run', 'Show what would happen without making changes', false)
     .action(async (opts) => {
       try {

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

@@ -28,7 +28,7 @@ const __dirname = dirname(__filename)
 const MIGRATIONS_DIR = resolve(__dirname, '../../migrations')
 
 interface MigrateOptions {
-  dbPassword: string
+  dbPassword?: string
   dryRun: boolean
 }
 
@@ -36,16 +36,21 @@ async function migrateCommand(options: MigrateOptions): Promise<void> {
   console.log('\n🗄️  Spine Framework — Migrate\n')
 
   const supabaseUrl = process.env.SUPABASE_URL
-  if (!supabaseUrl) {
-    console.error('❌ SUPABASE_URL not set. Run `spine-framework init` first.')
+  if (!supabaseUrl || supabaseUrl === 'https://your-project.supabase.co') {
+    console.error('❌ SUPABASE_URL not set. Fill in your .env file first.')
+    process.exit(1)
+  }
+
+  const dbPassword = options.dbPassword || process.env.SUPABASE_DB_PASSWORD
+  if (!dbPassword || dbPassword === 'your-db-password') {
+    console.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)
   }
 
-  // Derive connection string from Supabase URL
-  // Format: https://<ref>.supabase.co → postgres://postgres.<ref>:<password>@aws-0-<region>.pooler.supabase.com:5432/postgres
-  // Use direct connection (port 5432) via the db.<ref>.supabase.co host
   const projectRef = supabaseUrl.replace('https://', '').split('.')[0]
-  const connectionString = `postgresql://postgres:${options.dbPassword}@db.${projectRef}.supabase.co:5432/postgres`
+  const connectionString = `postgresql://postgres:${dbPassword}@db.${projectRef}.supabase.co:5432/postgres`
 
   if (!existsSync(MIGRATIONS_DIR)) {
     console.error(`❌ Migrations directory not found: ${MIGRATIONS_DIR}`)
@@ -120,7 +125,7 @@ export function registerMigrateCommands(program: Command) {
   program
     .command('migrate')
     .description('Apply SQL migrations via direct Postgres connection')
-    .requiredOption('--db-password <password>', 'Supabase database password (from dashboard → Settings → Database)')
+    .option('--db-password <password>', 'DB password override (default: reads SUPABASE_DB_PASSWORD from .env)')
     .option('--dry-run', 'Show what would happen without making changes', false)
     .action(async (opts) => {
       try {

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../.framework/cli/commands/init.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AA2IxC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,QAiBpD"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../.framework/cli/commands/init.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AA4IxC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,QAcpD"}

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

package/package.json

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