spine-framework 0.3.32 → 0.3.34

package/.framework/cli/index.ts

@@ -46,59 +46,57 @@ program
   .version('2.0.0')
   .option('--account <id>', 'Override the account ID for this command')
 
-;(async () => {
-  const [
-    { registerInitCommands },
-    { registerMigrateCommands },
-    { registerInstallAppCommands },
-    { registerStatusCommands },
-    { registerAuthCommands },
-    { registerPipelineCommands },
-    { registerItemCommands },
-    { registerAgentCommands },
-    { registerMigrationCommands },
-    { registerDoctorCommands },
-    { registerDevCommands },
-    { registerTestCommands },
-    { registerSystemCommands },
-    { registerGenerateCommands },
-    { registerCreateAppCommands },
-  ] = await Promise.all([
-    import('./commands/init.ts'),
-    import('./commands/migrate.ts'),
-    import('./commands/install-app.ts'),
-    import('./commands/status.ts'),
-    import('./commands/auth.ts'),
-    import('./commands/pipelines.ts'),
-    import('./commands/items.ts'),
-    import('./commands/agents.ts'),
-    import('./commands/migrations.ts'),
-    import('./commands/doctor.ts'),
-    import('./commands/dev.ts'),
-    import('./commands/test.ts'),
-    import('./commands/system.ts'),
-    import('./commands/generate.ts'),
-    import('./commands/create-app.ts'),
-  ])
+const [
+  { registerInitCommands },
+  { registerMigrateCommands },
+  { registerInstallAppCommands },
+  { registerStatusCommands },
+  { registerAuthCommands },
+  { registerPipelineCommands },
+  { registerItemCommands },
+  { registerAgentCommands },
+  { registerMigrationCommands },
+  { registerDoctorCommands },
+  { registerDevCommands },
+  { registerTestCommands },
+  { registerSystemCommands },
+  { registerGenerateCommands },
+  { registerCreateAppCommands },
+] = await Promise.all([
+  import('./commands/init.ts'),
+  import('./commands/migrate.ts'),
+  import('./commands/install-app.ts'),
+  import('./commands/status.ts'),
+  import('./commands/auth.ts'),
+  import('./commands/pipelines.ts'),
+  import('./commands/items.ts'),
+  import('./commands/agents.ts'),
+  import('./commands/migrations.ts'),
+  import('./commands/doctor.ts'),
+  import('./commands/dev.ts'),
+  import('./commands/test.ts'),
+  import('./commands/system.ts'),
+  import('./commands/generate.ts'),
+  import('./commands/create-app.ts'),
+])
 
-  registerInitCommands(program)
-  registerMigrateCommands(program)
-  registerInstallAppCommands(program)
-  registerStatusCommands(program)
-  registerAuthCommands(program)
-  registerPipelineCommands(program)
-  registerItemCommands(program)
-  registerAgentCommands(program)
-  registerMigrationCommands(program)
-  registerDoctorCommands(program)
-  registerDevCommands(program)
-  registerTestCommands(program)
-  registerSystemCommands(program)
-  registerGenerateCommands(program)
-  registerCreateAppCommands(program)
+registerInitCommands(program)
+registerMigrateCommands(program)
+registerInstallAppCommands(program)
+registerStatusCommands(program)
+registerAuthCommands(program)
+registerPipelineCommands(program)
+registerItemCommands(program)
+registerAgentCommands(program)
+registerMigrationCommands(program)
+registerDoctorCommands(program)
+registerDevCommands(program)
+registerTestCommands(program)
+registerSystemCommands(program)
+registerGenerateCommands(program)
+registerCreateAppCommands(program)
 
-  program.parseAsync(process.argv).catch((err) => {
-    console.error('Error:', err.message)
-    process.exit(1)
-  })
-})()
+program.parseAsync(process.argv).catch((err) => {
+  console.error('Error:', err.message)
+  process.exit(1)
+})

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

@@ -18,8 +18,11 @@ import { createClient } from '@supabase/supabase-js'
 
 // ─── ENVIRONMENT RESOLUTION ──────────────────────────────────────────────────
 
-// Environment variables are read lazily at call time (not at module load)
-// so the CLI works before .env is configured (e.g. for --help and init).
+const _env = (globalThis as any).process?.env || {}
+const supabaseUrl: string = _env.SUPABASE_URL || 'https://placeholder.supabase.co'
+const supabaseServiceKey: string = _env.SUPABASE_SERVICE_ROLE_KEY || ''
+const supabaseAnonKey: string = _env.SUPABASE_ANON_KEY || ''
+const dbSchema: string = _env.DB_SCHEMA || 'public'
 
 // ─── CLIENTS ─────────────────────────────────────────────────────────────────
 
@@ -57,23 +60,8 @@ import { createClient } from '@supabase/supabase-js'
  * // Only use adminDb if your custom code runs as a system/cron principal
  * ```
  */
-function getAdminDb() {
-  const url = (globalThis as any).process?.env?.SUPABASE_URL
-  const key = (globalThis as any).process?.env?.SUPABASE_SERVICE_ROLE_KEY
-  const schema = (globalThis as any).process?.env?.DB_SCHEMA || 'public'
-  if (!url || !key) {
-    throw new Error(
-      'SUPABASE_URL and SUPABASE_SERVICE_ROLE_KEY must be set.\n' +
-      'Add them to your .env file and run: npx spine-framework migrate'
-    )
-  }
-  return createClient(url, key, { db: { schema } })
-}
-
-export const adminDb = new Proxy({} as ReturnType<typeof getAdminDb>, {
-  get(_target, prop) {
-    return (getAdminDb() as any)[prop]
-  }
+export const adminDb = createClient(supabaseUrl, supabaseServiceKey, {
+  db: { schema: dbSchema }
 })
 
 // ─── CHUNK_START: SHARED_DB_GET_USER_DB ──────────────────────────────────────────────
@@ -91,11 +79,8 @@ export const adminDb = new Proxy({} as ReturnType<typeof getAdminDb>, {
  * @tags        database, supabase, rls, authentication, user-scoped
  */
 export function getUserDb(jwt: string) {
-  const url = (globalThis as any).process?.env?.SUPABASE_URL
-  const anonKey = (globalThis as any).process?.env?.SUPABASE_ANON_KEY
-  const schema = (globalThis as any).process?.env?.DB_SCHEMA || 'public'
-  return createClient(url, anonKey, {
-    db: { schema },
+  return createClient(supabaseUrl, supabaseAnonKey, {
+    db: { schema: dbSchema },
     global: { headers: { Authorization: `Bearer ${jwt}` } }
   })
 }

package/bin/spine-framework.cjs

@@ -0,0 +1,68 @@
+#!/usr/bin/env node
+// Thin shebang wrapper — invokes the TypeScript CLI via tsx.
+// 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, '../..')
+
+// Handle no-args case — show welcome before spawning tsx
+if (process.argv.length === 2) {
+  console.log('\nSpine Framework CLI')
+  console.log('Usage: spine-framework <command>\n')
+  console.log('Commands:')
+  console.log('  init          Scaffold a new Spine Framework project')
+  console.log('  migrate       Apply database migrations')
+  console.log('  install-app   Install a Spine Framework app from npm')
+  console.log('  status        Show installed apps and framework version')
+  console.log('\nRun spine-framework --help for full command list\n')
+  process.exit(0)
+}
+
+// Pre-load .env from the consumer project root so db.ts sees env vars at module load time.
+// tsx evaluates imports before Commander parses args, so we must inject here.
+const args = process.argv.slice(2)
+const childEnv = { ...process.env }
+
+const dotenvPath = resolve(process.cwd(), '.env')
+if (fs.existsSync(dotenvPath)) {
+  const lines = fs.readFileSync(dotenvPath, 'utf8').split('\n')
+  for (const line of lines) {
+    const trimmed = line.trim()
+    if (!trimmed || trimmed.startsWith('#')) continue
+    const eq = trimmed.indexOf('=')
+    if (eq === -1) continue
+    const key = trimmed.slice(0, eq).trim()
+    const val = trimmed.slice(eq + 1).trim()
+    if (key && !(key in childEnv)) childEnv[key] = val
+  }
+}
+
+// CLI flags override .env values
+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, 'bin/ws-shim.mts')
+
+// Find tsx: prefer consuming project's copy, fall back to our own
+const tsxPaths = [
+  resolve(projectRoot, 'node_modules/.bin/tsx'),
+  resolve(pkgRoot, 'node_modules/.bin/tsx'),
+]
+const tsx = tsxPaths.find(p => { try { fs.accessSync(p); return true } catch { return false } })
+
+if (!tsx) {
+  console.error('spine-framework: tsx not found. Run: npm install tsx')
+  process.exit(1)
+}
+
+try {
+  execFileSync(tsx, [entry, ...process.argv.slice(2)], { stdio: 'inherit', env: childEnv })
+} catch (e) {
+  process.exit(e.status ?? 1)
+}

package/bin/ws-shim.ts

@@ -7,4 +7,4 @@ if (typeof globalThis.WebSocket === 'undefined') {
 }
 
 // Now import the real CLI — all supabase createClient() calls happen after this point
-import('../.framework/cli/index.ts')
+await import('../.framework/cli/index.ts')

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "spine-framework",
-  "version": "0.3.32",
+  "version": "0.3.34",
   "description": "Multi-tenant, modular application platform for modern SaaS systems",
+  "type": "module",
   "bin": {
-    "spine-framework": "bin/spine-framework.js"
+    "spine-framework": "bin/spine-framework.cjs"
   },
   "files": [
     "bin/",