spine-framework 0.3.31 → 0.3.32

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

@@ -18,24 +18,8 @@ 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.
- *
- * Defaults to `'public'` (production schema). Set to `'v2'` only in legacy
- * environments. All new migrations target `public`.
- *
- * @inputSpec DB_SCHEMA: string — one of 'public' | 'v2'. Any other value is
- *   passed through as-is and will cause runtime query errors.
- * @outputSpec string — schema name applied to both Supabase clients.
- * @sideEffects none
- * @calledBy adminDb, getUserDb (applied at client construction time)
- */
-const dbSchema: string = _env.DB_SCHEMA || 'public'
+// 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).
 
 // ─── CLIENTS ─────────────────────────────────────────────────────────────────
 
@@ -73,9 +57,22 @@ const dbSchema: string = _env.DB_SCHEMA || 'public'
  * // Only use adminDb if your custom code runs as a system/cron principal
  * ```
  */
-export const adminDb = createClient(supabaseUrl, supabaseServiceKey, {
-  db: {
-    schema: dbSchema
+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]
   }
 })
 
@@ -94,15 +91,12 @@ export const adminDb = createClient(supabaseUrl, supabaseServiceKey, {
  * @tags        database, supabase, rls, authentication, user-scoped
  */
 export function getUserDb(jwt: string) {
-  return createClient(supabaseUrl, supabaseAnonKey, {
-    db: {
-      schema: dbSchema
-    },
-    global: {
-      headers: {
-        Authorization: `Bearer ${jwt}`
-      }
-    }
+  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 },
+    global: { headers: { Authorization: `Bearer ${jwt}` } }
   })
 }
 // ─── CHUNK_END: SHARED_DB_GET_USER_DB ────────────────────────────────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spine-framework",
-  "version": "0.3.31",
+  "version": "0.3.32",
   "description": "Multi-tenant, modular application platform for modern SaaS systems",
   "bin": {
     "spine-framework": "bin/spine-framework.js"