spine-framework 0.1.6 → 0.1.9

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

@@ -31,7 +31,6 @@ import type { Command } from 'commander'
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs'
 import { resolve, dirname } from 'path'
 import { fileURLToPath } from 'url'
-import { adminDb } from '../../functions/_shared/index.ts'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
@@ -70,13 +69,7 @@ async function runMigration(filename: string, dryRun: boolean): Promise<boolean>
     return false
   }
 
-  // Try exec_sql RPC first (works if schema already has it)
-  const { error } = await adminDb.rpc('exec_sql', { query: sql }).single()
-  if (!error) return true
-
-  // Fallback: use the Supabase /pg/query endpoint for raw SQL execution
-  console.log(`  ⚠️  exec_sql not available, using direct SQL endpoint...`)
-
+  // Use the Supabase /pg/query endpoint for raw SQL execution
   const pgResponse = await fetch(`${supabaseUrl}/pg/query`, {
     method: 'POST',
     headers: {
@@ -137,13 +130,15 @@ function scaffoldCustomWorkspace(dryRun: boolean): void {
 
 async function checkAlreadyInitialized(): Promise<boolean> {
   try {
-    const { data, error } = await adminDb
-      .from('apps')
-      .select('slug')
-      .eq('slug', 'spine-core')
-      .single()
-
-    return !error && !!data
+    const supabaseUrl = process.env.SUPABASE_URL
+    const serviceKey = process.env.SUPABASE_SERVICE_ROLE_KEY
+    if (!supabaseUrl || !serviceKey) return false
+    const res = await fetch(
+      `${supabaseUrl}/rest/v1/apps?slug=eq.spine-core&select=slug&limit=1`,
+      { headers: { apikey: serviceKey, Authorization: `Bearer ${serviceKey}` } }
+    )
+    const rows = await res.json() as any[]
+    return Array.isArray(rows) && rows.length > 0
   } catch {
     return false
   }
@@ -229,12 +224,21 @@ async function initCommand(options: InitOptions): Promise<void> {
   // Step 3: Record migration versions
   if (!options.dryRun) {
     console.log('\n📝 Step 3: Recording migration versions...')
-    await adminDb
-      .from('schema_migrations')
-      .upsert([
+    const supabaseUrl = process.env.SUPABASE_URL!
+    const serviceKey = process.env.SUPABASE_SERVICE_ROLE_KEY!
+    await fetch(`${supabaseUrl}/rest/v1/schema_migrations`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'apikey': serviceKey,
+        'Authorization': `Bearer ${serviceKey}`,
+        'Prefer': 'resolution=merge-duplicates',
+      },
+      body: JSON.stringify([
         { version: '000_foundation', applied_at: new Date().toISOString() },
         { version: '001_seed', applied_at: new Date().toISOString() },
-      ], { onConflict: 'version' })
+      ])
+    })
     console.log('  ✓ Migration versions recorded')
   }
 

package/.framework/functions/_shared/db.ts

@@ -18,11 +18,6 @@ import { createClient } from '@supabase/supabase-js'
 
 // ─── ENVIRONMENT RESOLUTION ──────────────────────────────────────────────────
 
-const _env = (globalThis as any).process?.env || {}
-const supabaseUrl: string = _env.SUPABASE_URL!
-const supabaseServiceKey: string = _env.SUPABASE_SERVICE_ROLE_KEY!
-const supabaseAnonKey: string = _env.SUPABASE_ANON_KEY!
-
 /**
  * Active database schema name, read from `DB_SCHEMA` env var.
  *
@@ -35,6 +30,10 @@ const supabaseAnonKey: string = _env.SUPABASE_ANON_KEY!
  * @sideEffects none
  * @calledBy adminDb, getUserDb (applied at client construction time)
  */
+const _env = (globalThis as any).process?.env || {}
+const supabaseUrl: string = _env.SUPABASE_URL!
+const supabaseServiceKey: string = _env.SUPABASE_SERVICE_ROLE_KEY!
+const supabaseAnonKey: string = _env.SUPABASE_ANON_KEY!
 const dbSchema: string = _env.DB_SCHEMA || 'public'
 
 // ─── CLIENTS ─────────────────────────────────────────────────────────────────

package/bin/spine-framework.cjs

@@ -3,6 +3,7 @@
 // This file is the npm bin entry point for spine-framework.
 const { execFileSync } = require('child_process')
 const { resolve } = require('path')
+const fs = require('fs')
 
 const pkgRoot = resolve(__dirname, '..')
 const projectRoot = resolve(pkgRoot, '../..')
@@ -13,10 +14,19 @@ if (process.argv.length === 2) {
   process.exit(0)
 }
 
+// Pre-parse credential flags so db.ts sees them as env vars at module load time.
+// tsx evaluates db.ts before Commander parses args, so we must inject here.
+const args = process.argv.slice(2)
+const childEnv = { ...process.env }
+for (let i = 0; i < args.length; i++) {
+  if (args[i] === '--url' && args[i + 1])               childEnv.SUPABASE_URL = args[++i]
+  if (args[i] === '--anon-key' && args[i + 1])          childEnv.SUPABASE_ANON_KEY = args[++i]
+  if (args[i] === '--service-role-key' && args[i + 1])  childEnv.SUPABASE_SERVICE_ROLE_KEY = args[++i]
+}
+
 const entry = resolve(pkgRoot, '.framework/cli/index.ts')
 
 // Find tsx: prefer consuming project's copy, fall back to our own
-const fs = require('fs')
 const tsxPaths = [
   resolve(projectRoot, 'node_modules/.bin/tsx'),
   resolve(pkgRoot, 'node_modules/.bin/tsx'),
@@ -29,7 +39,7 @@ if (!tsx) {
 }
 
 try {
-  execFileSync(tsx, [entry, ...process.argv.slice(2)], { stdio: 'inherit' })
+  execFileSync(tsx, [entry, ...process.argv.slice(2)], { stdio: 'inherit', env: childEnv })
 } catch (e) {
   process.exit(e.status ?? 1)
 }

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;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAgOxC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,QAkBpD"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../.framework/cli/commands/init.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAoOxC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,QAkBpD"}

package/dist/functions/_shared/db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../../.framework/functions/_shared/db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA2BH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,eAAO,MAAM,OAAO,iFAIlB,CAAA;AAGF;;;;;;;;;;;;GAYG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,mFAWpC;AAKD;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;IACxB,IAAI,EAAE,CAAC,GAAG,IAAI,CAAA;IACd,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,KAAK;;;;;;;;CAQjB,CAAA"}
+{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../../.framework/functions/_shared/db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA0BH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,eAAO,MAAM,OAAO,iFAIlB,CAAA;AAGF;;;;;;;;;;;;GAYG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,mFAWpC;AAKD;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;IACxB,IAAI,EAAE,CAAC,GAAG,IAAI,CAAA;IACd,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,KAAK;;;;;;;;CAQjB,CAAA"}

package/package.json

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