@opensaas/stack-cli 0.1.4 → 0.1.6

package/src/generator/__snapshots__/context.test.ts.snap

@@ -1,5 +1,110 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`Context Generator > generateContext > should export rawOpensaasContext 1`] = `
+"/**
+ * Auto-generated context factory
+ *
+ * This module provides a simple API for creating OpenSaas contexts.
+ * It abstracts away Prisma client management and configuration.
+ *
+ * DO NOT EDIT - This file is automatically generated by 'pnpm generate'
+ */
+
+import { getContext as getOpensaasContext } from '@opensaas/stack-core'
+import type { Session as OpensaasSession, OpenSaasConfig } from '@opensaas/stack-core'
+import { PrismaClient } from './prisma-client'
+import type { Context } from './types'
+import configOrPromise from '../opensaas.config'
+
+// Resolve config if it's a Promise (when plugins are present)
+const configPromise = Promise.resolve(configOrPromise)
+let resolvedConfig: OpenSaasConfig | null = null
+
+// Internal Prisma singleton - managed automatically
+const globalForPrisma = globalThis as unknown as { prisma: PrismaClient | undefined }
+let prisma: PrismaClient | null = null
+
+async function getPrisma() {
+  if (!prisma) {
+    if (!resolvedConfig) {
+      resolvedConfig = await configPromise
+    }
+    prisma = globalForPrisma.prisma ?? new PrismaClient()
+    if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma
+  }
+  return prisma
+}
+
+async function getConfig() {
+  if (!resolvedConfig) {
+    resolvedConfig = await configPromise
+  }
+  return resolvedConfig
+}
+
+/**
+ * Storage utilities (not configured)
+ */
+const storage = {
+  uploadFile: async () => {
+    throw new Error('Storage is not configured. Add storage providers to your opensaas.config.ts')
+  },
+  uploadImage: async () => {
+    throw new Error('Storage is not configured. Add storage providers to your opensaas.config.ts')
+  },
+  deleteFile: async () => {
+    throw new Error('Storage is not configured. Add storage providers to your opensaas.config.ts')
+  },
+  deleteImage: async () => {
+    throw new Error('Storage is not configured. Add storage providers to your opensaas.config.ts')
+  },
+}
+
+/**
+ * Get OpenSaas context with optional session
+ *
+ * @param session - Optional session object (structure defined by your application)
+ *
+ * @example
+ * \`\`\`typescript
+ * // Anonymous access
+ * const context = await getContext()
+ * const posts = await context.db.post.findMany()
+ *
+ * // Authenticated access
+ * const context = await getContext({ userId: 'user-123' })
+ * const myPosts = await context.db.post.findMany()
+ *
+ * // With custom session type
+ * type CustomSession = { userId: string; email: string; role: string } | null
+ * const context = await getContext<CustomSession>({ userId: '123', email: 'user@example.com', role: 'admin' })
+ * // context.session is now typed as CustomSession
+ * \`\`\`
+ */
+export async function getContext<TSession extends OpensaasSession = OpensaasSession>(session?: TSession): Promise<Context<TSession>> {
+  const config = await getConfig()
+  const prismaClient = await getPrisma()
+  return getOpensaasContext(config, prismaClient, session ?? null, storage) as Context<TSession>
+}
+
+/**
+ * Raw context for synchronous initialization (e.g., Better-auth setup)
+ * This is only available after config is resolved, use with caution
+ */
+export const rawOpensaasContext = (async () => {
+  const config = await getConfig()
+  const prismaClient = await getPrisma()
+  return getOpensaasContext(config, prismaClient, null, storage)
+})()
+
+/**
+ * Re-export resolved config for use in admin pages and server actions
+ * This is a promise that resolves to the config
+ */
+export const config = getConfig()
+"
+`;
+
 exports[`Context Generator > generateContext > should generate context factory with custom Prisma client constructor 1`] = `
 "/**
  * Auto-generated context factory
@@ -11,15 +116,36 @@ exports[`Context Generator > generateContext > should generate context factory w
  */
 
 import { getContext as getOpensaasContext } from '@opensaas/stack-core'
-import type { Session as OpensaasSession } from '@opensaas/stack-core'
+import type { Session as OpensaasSession, OpenSaasConfig } from '@opensaas/stack-core'
 import { PrismaClient } from './prisma-client'
 import type { Context } from './types'
-import config from '../opensaas.config'
+import configOrPromise from '../opensaas.config'
+
+// Resolve config if it's a Promise (when plugins are present)
+const configPromise = Promise.resolve(configOrPromise)
+let resolvedConfig: OpenSaasConfig | null = null
 
 // Internal Prisma singleton - managed automatically
 const globalForPrisma = globalThis as unknown as { prisma: PrismaClient | undefined }
-const prisma = globalForPrisma.prisma ?? config.db.prismaClientConstructor!(PrismaClient)
-if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma
+let prisma: PrismaClient | null = null
+
+async function getPrisma() {
+  if (!prisma) {
+    if (!resolvedConfig) {
+      resolvedConfig = await configPromise
+    }
+    prisma = globalForPrisma.prisma ?? resolvedConfig.db.prismaClientConstructor!(PrismaClient)
+    if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma
+  }
+  return prisma
+}
+
+async function getConfig() {
+  if (!resolvedConfig) {
+    resolvedConfig = await configPromise
+  }
+  return resolvedConfig
+}
 
 /**
  * Storage utilities (not configured)
@@ -47,24 +173,40 @@ const storage = {
  * @example
  * \`\`\`typescript
  * // Anonymous access
- * const context = getContext()
+ * const context = await getContext()
  * const posts = await context.db.post.findMany()
  *
  * // Authenticated access
- * const context = getContext({ userId: 'user-123' })
+ * const context = await getContext({ userId: 'user-123' })
  * const myPosts = await context.db.post.findMany()
  *
  * // With custom session type
  * type CustomSession = { userId: string; email: string; role: string } | null
- * const context = getContext<CustomSession>({ userId: '123', email: 'user@example.com', role: 'admin' })
+ * const context = await getContext<CustomSession>({ userId: '123', email: 'user@example.com', role: 'admin' })
  * // context.session is now typed as CustomSession
  * \`\`\`
  */
-export function getContext<TSession extends OpensaasSession = OpensaasSession>(session?: TSession): Context<TSession> {
-  return getOpensaasContext(config, prisma, session ?? null, storage) as Context<TSession>
+export async function getContext<TSession extends OpensaasSession = OpensaasSession>(session?: TSession): Promise<Context<TSession>> {
+  const config = await getConfig()
+  const prismaClient = await getPrisma()
+  return getOpensaasContext(config, prismaClient, session ?? null, storage) as Context<TSession>
 }
 
-export const rawOpensaasContext = getContext()
+/**
+ * Raw context for synchronous initialization (e.g., Better-auth setup)
+ * This is only available after config is resolved, use with caution
+ */
+export const rawOpensaasContext = (async () => {
+  const config = await getConfig()
+  const prismaClient = await getPrisma()
+  return getOpensaasContext(config, prismaClient, null, storage)
+})()
+
+/**
+ * Re-export resolved config for use in admin pages and server actions
+ * This is a promise that resolves to the config
+ */
+export const config = getConfig()
 "
 `;
 
@@ -79,15 +221,36 @@ exports[`Context Generator > generateContext > should generate context factory w
  */
 
 import { getContext as getOpensaasContext } from '@opensaas/stack-core'
-import type { Session as OpensaasSession } from '@opensaas/stack-core'
+import type { Session as OpensaasSession, OpenSaasConfig } from '@opensaas/stack-core'
 import { PrismaClient } from './prisma-client'
 import type { Context } from './types'
-import config from '../opensaas.config'
+import configOrPromise from '../opensaas.config'
+
+// Resolve config if it's a Promise (when plugins are present)
+const configPromise = Promise.resolve(configOrPromise)
+let resolvedConfig: OpenSaasConfig | null = null
 
 // Internal Prisma singleton - managed automatically
 const globalForPrisma = globalThis as unknown as { prisma: PrismaClient | undefined }
-const prisma = globalForPrisma.prisma ?? new PrismaClient()
-if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma
+let prisma: PrismaClient | null = null
+
+async function getPrisma() {
+  if (!prisma) {
+    if (!resolvedConfig) {
+      resolvedConfig = await configPromise
+    }
+    prisma = globalForPrisma.prisma ?? new PrismaClient()
+    if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma
+  }
+  return prisma
+}
+
+async function getConfig() {
+  if (!resolvedConfig) {
+    resolvedConfig = await configPromise
+  }
+  return resolvedConfig
+}
 
 /**
  * Storage utilities (not configured)
@@ -115,23 +278,39 @@ const storage = {
  * @example
  * \`\`\`typescript
  * // Anonymous access
- * const context = getContext()
+ * const context = await getContext()
  * const posts = await context.db.post.findMany()
  *
  * // Authenticated access
- * const context = getContext({ userId: 'user-123' })
+ * const context = await getContext({ userId: 'user-123' })
  * const myPosts = await context.db.post.findMany()
  *
  * // With custom session type
  * type CustomSession = { userId: string; email: string; role: string } | null
- * const context = getContext<CustomSession>({ userId: '123', email: 'user@example.com', role: 'admin' })
+ * const context = await getContext<CustomSession>({ userId: '123', email: 'user@example.com', role: 'admin' })
  * // context.session is now typed as CustomSession
  * \`\`\`
  */
-export function getContext<TSession extends OpensaasSession = OpensaasSession>(session?: TSession): Context<TSession> {
-  return getOpensaasContext(config, prisma, session ?? null, storage) as Context<TSession>
+export async function getContext<TSession extends OpensaasSession = OpensaasSession>(session?: TSession): Promise<Context<TSession>> {
+  const config = await getConfig()
+  const prismaClient = await getPrisma()
+  return getOpensaasContext(config, prismaClient, session ?? null, storage) as Context<TSession>
 }
 
-export const rawOpensaasContext = getContext()
+/**
+ * Raw context for synchronous initialization (e.g., Better-auth setup)
+ * This is only available after config is resolved, use with caution
+ */
+export const rawOpensaasContext = (async () => {
+  const config = await getConfig()
+  const prismaClient = await getPrisma()
+  return getOpensaasContext(config, prismaClient, null, storage)
+})()
+
+/**
+ * Re-export resolved config for use in admin pages and server actions
+ * This is a promise that resolves to the config
+ */
+export const config = getConfig()
 "
 `;

package/src/generator/context.test.ts

@@ -95,9 +95,9 @@ describe('Context Generator', () => {
       const context = generateContext(config)
 
       expect(context).toContain('// Anonymous access')
-      expect(context).toContain('const context = getContext()')
+      expect(context).toContain('const context = await getContext()')
       expect(context).toContain('// Authenticated access')
-      expect(context).toContain("const context = getContext({ userId: 'user-123' })")
+      expect(context).toContain("const context = await getContext({ userId: 'user-123' })")
     })
 
     it('should export rawOpensaasContext', () => {
@@ -111,7 +111,7 @@ describe('Context Generator', () => {
 
       const context = generateContext(config)
 
-      expect(context).toContain('export const rawOpensaasContext = getContext()')
+      expect(context).toMatchSnapshot()
     })
 
     it('should type session parameter correctly', () => {
@@ -128,18 +128,5 @@ describe('Context Generator', () => {
       expect(context).toContain('session?: TSession')
       expect(context).toContain('<TSession extends OpensaasSession = OpensaasSession>')
     })
-
-    it('should call getOpensaasContext with correct arguments', () => {
-      const config: OpenSaasConfig = {
-        db: {
-          provider: 'sqlite',
-          url: 'file:./dev.db',
-        },
-        lists: {},
-      }
-
-      const context = generateContext(config)
-      expect(context).toContain('getOpensaasContext(config, prisma, session ?? null, storage)')
-    })
   })
 })

package/src/generator/context.ts

@@ -17,7 +17,7 @@ export function generateContext(config: OpenSaasConfig): string {
 
   // Generate the Prisma client instantiation code
   const prismaInstantiation = hasCustomConstructor
-    ? `config.db.prismaClientConstructor!(PrismaClient)`
+    ? `resolvedConfig.db.prismaClientConstructor!(PrismaClient)`
     : `new PrismaClient()`
 
   // Generate storage utilities if storage is configured
@@ -47,21 +47,25 @@ async function getStorageRuntime() {
  */
 const storage = {
   uploadFile: async (providerName: string, file: File, buffer: Buffer, options?: unknown) => {
+    const config = await getConfig()
     const runtime = await getStorageRuntime()
     return runtime.uploadFile(config, providerName, { file, buffer }, options as any)
   },
 
   uploadImage: async (providerName: string, file: File, buffer: Buffer, options?: unknown) => {
+    const config = await getConfig()
     const runtime = await getStorageRuntime()
     return runtime.uploadImage(config, providerName, { file, buffer }, options as any)
   },
 
   deleteFile: async (providerName: string, filename: string) => {
+    const config = await getConfig()
     const runtime = await getStorageRuntime()
     return runtime.deleteFile(config, providerName, filename)
   },
 
   deleteImage: async (metadata: unknown) => {
+    const config = await getConfig()
     const runtime = await getStorageRuntime()
     return runtime.deleteImage(config, metadata as any)
   },
@@ -87,6 +91,7 @@ const storage = {
 }
 `
 
+  // Always use async version for consistency
   return `/**
  * Auto-generated context factory
  *
@@ -97,15 +102,36 @@ const storage = {
  */
 
 import { getContext as getOpensaasContext } from '@opensaas/stack-core'
-import type { Session as OpensaasSession } from '@opensaas/stack-core'
+import type { Session as OpensaasSession, OpenSaasConfig } from '@opensaas/stack-core'
 import { PrismaClient } from './prisma-client'
 import type { Context } from './types'
-import config from '../opensaas.config'
+import configOrPromise from '../opensaas.config'
+
+// Resolve config if it's a Promise (when plugins are present)
+const configPromise = Promise.resolve(configOrPromise)
+let resolvedConfig: OpenSaasConfig | null = null
 
 // Internal Prisma singleton - managed automatically
 const globalForPrisma = globalThis as unknown as { prisma: PrismaClient | undefined }
-const prisma = globalForPrisma.prisma ?? ${prismaInstantiation}
-if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma
+let prisma: PrismaClient | null = null
+
+async function getPrisma() {
+  if (!prisma) {
+    if (!resolvedConfig) {
+      resolvedConfig = await configPromise
+    }
+    prisma = globalForPrisma.prisma ?? ${prismaInstantiation}
+    if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma
+  }
+  return prisma
+}
+
+async function getConfig() {
+  if (!resolvedConfig) {
+    resolvedConfig = await configPromise
+  }
+  return resolvedConfig
+}
 ${storageUtilities}
 /**
  * Get OpenSaas context with optional session
@@ -115,24 +141,40 @@ ${storageUtilities}
  * @example
  * \`\`\`typescript
  * // Anonymous access
- * const context = getContext()
+ * const context = await getContext()
  * const posts = await context.db.post.findMany()
  *
  * // Authenticated access
- * const context = getContext({ userId: 'user-123' })
+ * const context = await getContext({ userId: 'user-123' })
  * const myPosts = await context.db.post.findMany()
  *
  * // With custom session type
  * type CustomSession = { userId: string; email: string; role: string } | null
- * const context = getContext<CustomSession>({ userId: '123', email: 'user@example.com', role: 'admin' })
+ * const context = await getContext<CustomSession>({ userId: '123', email: 'user@example.com', role: 'admin' })
  * // context.session is now typed as CustomSession
  * \`\`\`
  */
-export function getContext<TSession extends OpensaasSession = OpensaasSession>(session?: TSession): Context<TSession> {
-  return getOpensaasContext(config, prisma, session ?? null, storage) as Context<TSession>
+export async function getContext<TSession extends OpensaasSession = OpensaasSession>(session?: TSession): Promise<Context<TSession>> {
+  const config = await getConfig()
+  const prismaClient = await getPrisma()
+  return getOpensaasContext(config, prismaClient, session ?? null, storage) as Context<TSession>
 }
 
-export const rawOpensaasContext = getContext()
+/**
+ * Raw context for synchronous initialization (e.g., Better-auth setup)
+ * This is only available after config is resolved, use with caution
+ */
+export const rawOpensaasContext = (async () => {
+  const config = await getConfig()
+  const prismaClient = await getPrisma()
+  return getOpensaasContext(config, prismaClient, null, storage)
+})()
+
+/**
+ * Re-export resolved config for use in admin pages and server actions
+ * This is a promise that resolves to the config
+ */
+export const config = getConfig()
 `
 }
 

package/src/generator/types.ts

@@ -186,6 +186,51 @@ function generateContextType(): string {
   return lines.join('\n')
 }
 
+/**
+ * Collect TypeScript imports from field configurations
+ */
+function collectFieldImports(config: OpenSaasConfig): Array<{
+  names: string[]
+  from: string
+  typeOnly: boolean
+}> {
+  const importsMap = new Map<string, { names: Set<string>; typeOnly: boolean }>()
+
+  // Iterate through all lists and fields
+  for (const listConfig of Object.values(config.lists)) {
+    for (const fieldConfig of Object.values(listConfig.fields)) {
+      // Check if field provides imports
+      if (fieldConfig.getTypeScriptImports) {
+        const imports = fieldConfig.getTypeScriptImports()
+        for (const imp of imports) {
+          const existing = importsMap.get(imp.from)
+          if (existing) {
+            // Merge names into existing import
+            imp.names.forEach((name) => existing.names.add(name))
+            // If either import is not type-only, make the merged import not type-only
+            if (imp.typeOnly === false) {
+              existing.typeOnly = false
+            }
+          } else {
+            // Add new import
+            importsMap.set(imp.from, {
+              names: new Set(imp.names),
+              typeOnly: imp.typeOnly ?? true,
+            })
+          }
+        }
+      }
+    }
+  }
+
+  // Convert map to array
+  return Array.from(importsMap.entries()).map(([from, { names, typeOnly }]) => ({
+    names: Array.from(names).sort(),
+    from,
+    typeOnly,
+  }))
+}
+
 /**
  * Generate all TypeScript types from config
  */
@@ -205,6 +250,15 @@ export function generateTypes(config: OpenSaasConfig): string {
     "import type { Session as OpensaasSession, StorageUtils, ServerActionProps, AccessControlledDB } from '@opensaas/stack-core'",
   )
   lines.push("import type { PrismaClient } from './prisma-client'")
+
+  // Add field-specific imports
+  const fieldImports = collectFieldImports(config)
+  for (const imp of fieldImports) {
+    const typePrefix = imp.typeOnly ? 'type ' : ''
+    const names = imp.names.join(', ')
+    lines.push(`import ${typePrefix}{ ${names} } from '${imp.from}'`)
+  }
+
   lines.push('')
 
   // Generate types for each list