@opensaas/stack-cli 0.1.7 → 0.4.0

package/src/commands/__snapshots__/generate.test.ts.snap

@@ -12,8 +12,9 @@ exports[`Generate Command Integration > Generator Integration > should 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 { PrismaClient } from './prisma-client/client'
 import type { Context } from './types'
+import { prismaExtensions } from './prisma-extensions'
 import configOrPromise from '../opensaas.config'
 
 // Resolve config if it's a Promise (when plugins are present)
@@ -21,15 +22,29 @@ 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
+const globalForPrisma = globalThis as unknown as { prisma: ReturnType<typeof createExtendedPrisma> | null }
+let prisma: ReturnType<typeof createExtendedPrisma> | null = null
+
+/**
+ * Create Prisma client with result extensions
+ */
+function createExtendedPrisma(basePrisma: PrismaClient) {
+  // Check if there are any extensions to apply
+  if (Object.keys(prismaExtensions).length === 0) {
+    return basePrisma
+  }
+  // Apply result extensions
+  return basePrisma.$extends(prismaExtensions)
+}
 
 async function getPrisma() {
   if (!prisma) {
     if (!resolvedConfig) {
       resolvedConfig = await configPromise
     }
-    prisma = globalForPrisma.prisma ?? new PrismaClient()
+    const basePrisma = resolvedConfig.db.prismaClientConstructor!(PrismaClient)
+    const extendedPrisma = createExtendedPrisma(basePrisma)
+    prisma = globalForPrisma.prisma ?? extendedPrisma
     if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma
   }
   return prisma
@@ -84,7 +99,7 @@ const storage = {
 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>
+  return getOpensaasContext(config, prismaClient, session ?? null, storage) as unknown as Context<TSession>
 }
 
 /**
@@ -94,7 +109,7 @@ export async function getContext<TSession extends OpensaasSession = OpensaasSess
 export const rawOpensaasContext = (async () => {
   const config = await getConfig()
   const prismaClient = await getPrisma()
-  return getOpensaasContext(config, prismaClient, null, storage)
+  return getOpensaasContext(config, prismaClient, null, storage) as unknown as Context
 })()
 
 /**
@@ -107,13 +122,12 @@ export const config = getConfig()
 
 exports[`Generate Command Integration > Generator Integration > should generate all files for a basic config > prisma-schema 1`] = `
 "generator client {
-  provider = "prisma-client-js"
+  provider = "prisma-client"
   output   = "../.opensaas/prisma-client"
 }
 
 datasource db {
   provider = "sqlite"
-  url      = env("DATABASE_URL")
 }
 
 model User {
@@ -132,16 +146,35 @@ exports[`Generate Command Integration > Generator Integration > should generate
  * DO NOT EDIT - This file is automatically generated
  */
 
-import type { Session as OpensaasSession, StorageUtils, ServerActionProps, AccessControlledDB } from '@opensaas/stack-core'
-import type { PrismaClient } from './prisma-client'
+import type { Session as OpensaasSession, StorageUtils, ServerActionProps, AccessControlledDB, AccessContext } from '@opensaas/stack-core'
+import type { PrismaClient, Prisma } from './prisma-client/client'
+import type { PluginServices } from './plugin-types'
+
+/**
+ * Virtual fields for User - computed fields not in database
+ * These are added to query results via resolveOutput hooks
+ */
+export type UserVirtualFields = {
+  // No virtual fields defined
+}
+
+/**
+ * Transformed fields for User - fields with resultExtension transformations
+ * These override Prisma's base types with transformed types via result extensions
+ */
+export type UserTransformedFields = {
+  // No transformed fields defined
+}
 
-export type User = {
+export type UserOutput = {
   id: string
   name: string
   email: string
   createdAt: Date
   updatedAt: Date
-}
+} & UserVirtualFields
+
+export type User = UserOutput
 
 export type UserCreateInput = {
   name: string
@@ -162,26 +195,94 @@ export type UserWhereInput = {
   email?: { equals?: string, not?: string }
 }
 
-export type Context<TSession extends OpensaasSession = OpensaasSession> = {
-  db: AccessControlledDB<PrismaClient>
+/**
+ * Hook types for User list
+ * Properly typed to use Prisma's generated input types
+ */
+export type UserHooks = {
+  resolveInput?: (args:
+    | {
+        operation: 'create'
+        resolvedData: Prisma.UserCreateInput
+        item: undefined
+        context: import('@opensaas/stack-core').AccessContext
+      }
+    | {
+        operation: 'update'
+        resolvedData: Prisma.UserUpdateInput
+        item: User
+        context: import('@opensaas/stack-core').AccessContext
+      }
+  ) => Promise<Prisma.UserCreateInput | Prisma.UserUpdateInput>
+  validateInput?: (args: {
+    operation: 'create' | 'update'
+    resolvedData: Prisma.UserCreateInput | Prisma.UserUpdateInput
+    item?: User
+    context: import('@opensaas/stack-core').AccessContext
+    addValidationError: (msg: string) => void
+  }) => Promise<void>
+  beforeOperation?: (args: {
+    operation: 'create' | 'update' | 'delete'
+    resolvedData?: Prisma.UserCreateInput | Prisma.UserUpdateInput
+    item?: User
+    context: import('@opensaas/stack-core').AccessContext
+  }) => Promise<void>
+  afterOperation?: (args: {
+    operation: 'create' | 'update' | 'delete'
+    resolvedData?: Prisma.UserCreateInput | Prisma.UserUpdateInput
+    item?: User
+    context: import('@opensaas/stack-core').AccessContext
+  }) => Promise<void>
+}
+
+/**
+ * Custom DB type that uses Prisma's conditional types with virtual and transformed field support
+ * Types change based on select/include - relationships only present when explicitly included
+ * Virtual fields and transformed fields are added to the base model type
+ */
+export type CustomDB = Omit<AccessControlledDB<PrismaClient>, 
+  'user'
+> & {
+  user: {
+    findUnique: <T extends Prisma.UserFindUniqueArgs>(
+      args: Prisma.SelectSubset<T, Prisma.UserFindUniqueArgs>
+    ) => Promise<(Omit<Prisma.UserGetPayload<T>, keyof UserTransformedFields> & UserTransformedFields & UserVirtualFields) | null>
+    findMany: <T extends Prisma.UserFindManyArgs>(
+      args?: Prisma.SelectSubset<T, Prisma.UserFindManyArgs>
+    ) => Promise<Array<Omit<Prisma.UserGetPayload<T>, keyof UserTransformedFields> & UserTransformedFields & UserVirtualFields>>
+    create: <T extends Prisma.UserCreateArgs>(
+      args: Prisma.SelectSubset<T, Prisma.UserCreateArgs>
+    ) => Promise<Omit<Prisma.UserGetPayload<T>, keyof UserTransformedFields> & UserTransformedFields & UserVirtualFields>
+    update: <T extends Prisma.UserUpdateArgs>(
+      args: Prisma.SelectSubset<T, Prisma.UserUpdateArgs>
+    ) => Promise<(Omit<Prisma.UserGetPayload<T>, keyof UserTransformedFields> & UserTransformedFields & UserVirtualFields) | null>
+    delete: <T extends Prisma.UserDeleteArgs>(
+      args: Prisma.SelectSubset<T, Prisma.UserDeleteArgs>
+    ) => Promise<(Omit<Prisma.UserGetPayload<T>, keyof UserTransformedFields> & UserTransformedFields & UserVirtualFields) | null>
+    count: (args?: Prisma.UserCountArgs) => Promise<number>
+  }
+}
+
+/**
+ * Context type compatible with AccessContext but with CustomDB for virtual field typing
+ * Extends AccessContext and overrides db property to include virtual fields in output types
+ */
+export type Context<TSession extends OpensaasSession = OpensaasSession> = Omit<AccessContext<PrismaClient>, 'db' | 'session'> & {
+  db: CustomDB
   session: TSession
-  prisma: PrismaClient
-  storage: StorageUtils
   serverAction: (props: ServerActionProps) => Promise<unknown>
   sudo: () => Context<TSession>
-  _isSudo: boolean
 }"
 `;
 
 exports[`Generate Command Integration > Generator Integration > should generate consistent output across multiple runs > consistent-output 1`] = `
 "generator client {
-  provider = "prisma-client-js"
+  provider = "prisma-client"
   output   = "../.opensaas/prisma-client"
 }
 
 datasource db {
   provider = "sqlite"
-  url      = env("DATABASE_URL")
 }
 
 model User {
@@ -195,52 +296,48 @@ model User {
 
 exports[`Generate Command Integration > Generator Integration > should handle different database providers > mysql-provider 1`] = `
 "generator client {
-  provider = "prisma-client-js"
+  provider = "prisma-client"
   output   = "../.opensaas/prisma-client"
 }
 
 datasource db {
   provider = "mysql"
-  url      = env("DATABASE_URL")
 }
 "
 `;
 
 exports[`Generate Command Integration > Generator Integration > should handle different database providers > postgresql-provider 1`] = `
 "generator client {
-  provider = "prisma-client-js"
+  provider = "prisma-client"
   output   = "../.opensaas/prisma-client"
 }
 
 datasource db {
   provider = "postgresql"
-  url      = env("DATABASE_URL")
 }
 "
 `;
 
 exports[`Generate Command Integration > Generator Integration > should handle different database providers > sqlite-provider 1`] = `
 "generator client {
-  provider = "prisma-client-js"
+  provider = "prisma-client"
   output   = "../.opensaas/prisma-client"
 }
 
 datasource db {
   provider = "sqlite"
-  url      = env("DATABASE_URL")
 }
 "
 `;
 
 exports[`Generate Command Integration > Generator Integration > should handle empty lists config > empty-lists-schema 1`] = `
 "generator client {
-  provider = "prisma-client-js"
+  provider = "prisma-client"
   output   = "../.opensaas/prisma-client"
 }
 
 datasource db {
   provider = "sqlite"
-  url      = env("DATABASE_URL")
 }
 "
 `;
@@ -251,29 +348,40 @@ exports[`Generate Command Integration > Generator Integration > should handle em
  * DO NOT EDIT - This file is automatically generated
  */
 
-import type { Session as OpensaasSession, StorageUtils, ServerActionProps, AccessControlledDB } from '@opensaas/stack-core'
-import type { PrismaClient } from './prisma-client'
+import type { Session as OpensaasSession, StorageUtils, ServerActionProps, AccessControlledDB, AccessContext } from '@opensaas/stack-core'
+import type { PrismaClient, Prisma } from './prisma-client/client'
+import type { PluginServices } from './plugin-types'
+
+/**
+ * Custom DB type that uses Prisma's conditional types with virtual and transformed field support
+ * Types change based on select/include - relationships only present when explicitly included
+ * Virtual fields and transformed fields are added to the base model type
+ */
+export type CustomDB = Omit<AccessControlledDB<PrismaClient>, 
+  
+> & {
+}
 
-export type Context<TSession extends OpensaasSession = OpensaasSession> = {
-  db: AccessControlledDB<PrismaClient>
+/**
+ * Context type compatible with AccessContext but with CustomDB for virtual field typing
+ * Extends AccessContext and overrides db property to include virtual fields in output types
+ */
+export type Context<TSession extends OpensaasSession = OpensaasSession> = Omit<AccessContext<PrismaClient>, 'db' | 'session'> & {
+  db: CustomDB
   session: TSession
-  prisma: PrismaClient
-  storage: StorageUtils
   serverAction: (props: ServerActionProps) => Promise<unknown>
   sudo: () => Context<TSession>
-  _isSudo: boolean
 }"
 `;
 
 exports[`Generate Command Integration > Generator Integration > should overwrite existing files > overwrite-after 1`] = `
 "generator client {
-  provider = "prisma-client-js"
+  provider = "prisma-client"
   output   = "../.opensaas/prisma-client"
 }
 
 datasource db {
   provider = "sqlite"
-  url      = env("DATABASE_URL")
 }
 
 model Post {
@@ -287,13 +395,12 @@ model Post {
 
 exports[`Generate Command Integration > Generator Integration > should overwrite existing files > overwrite-before 1`] = `
 "generator client {
-  provider = "prisma-client-js"
+  provider = "prisma-client"
   output   = "../.opensaas/prisma-client"
 }
 
 datasource db {
   provider = "sqlite"
-  url      = env("DATABASE_URL")
 }
 
 model User {

package/src/commands/dev.test.ts

@@ -73,7 +73,6 @@ describe('Dev Command', () => {
       `
       import { config } from '@opensaas/stack-core'
       export default config({
-        db: { provider: 'sqlite', url: 'file:./dev.db' },
         lists: {}
       })
     `,

package/src/commands/generate.test.ts

@@ -48,7 +48,8 @@ describe('Generate Command Integration', () => {
       const config: OpenSaasConfig = {
         db: {
           provider: 'sqlite',
-          url: 'file:./dev.db',
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          prismaClientConstructor: (() => null) as any,
         },
         lists: {
           User: {
@@ -89,7 +90,8 @@ describe('Generate Command Integration', () => {
       const config: OpenSaasConfig = {
         db: {
           provider: 'sqlite',
-          url: 'file:./dev.db',
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          prismaClientConstructor: (() => null) as any,
         },
         lists: {},
       }
@@ -106,7 +108,8 @@ describe('Generate Command Integration', () => {
       const config1: OpenSaasConfig = {
         db: {
           provider: 'sqlite',
-          url: 'file:./dev.db',
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          prismaClientConstructor: (() => null) as any,
         },
         lists: {
           User: {
@@ -120,7 +123,8 @@ describe('Generate Command Integration', () => {
       const config2: OpenSaasConfig = {
         db: {
           provider: 'sqlite',
-          url: 'file:./dev.db',
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          prismaClientConstructor: (() => null) as any,
         },
         lists: {
           Post: {
@@ -148,7 +152,8 @@ describe('Generate Command Integration', () => {
       const config: OpenSaasConfig = {
         db: {
           provider: 'sqlite',
-          url: 'file:./dev.db',
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          prismaClientConstructor: (() => null) as any,
         },
         opensaasPath: '.custom',
         lists: {},
@@ -169,7 +174,8 @@ describe('Generate Command Integration', () => {
       const config: OpenSaasConfig = {
         db: {
           provider: 'sqlite',
-          url: 'file:./dev.db',
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          prismaClientConstructor: (() => null) as any,
         },
         lists: {
           User: {
@@ -198,7 +204,8 @@ describe('Generate Command Integration', () => {
       const config: OpenSaasConfig = {
         db: {
           provider: 'sqlite',
-          url: 'file:./dev.db',
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          prismaClientConstructor: (() => null) as any,
         },
         lists: {},
       }
@@ -227,6 +234,8 @@ describe('Generate Command Integration', () => {
           db: {
             provider,
             url: provider === 'sqlite' ? 'file:./dev.db' : 'postgresql://localhost:5432/db',
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            prismaClientConstructor: (() => null) as any,
           },
           lists: {},
         }
@@ -243,7 +252,8 @@ describe('Generate Command Integration', () => {
       const config: OpenSaasConfig = {
         db: {
           provider: 'sqlite',
-          url: 'file:./dev.db',
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          prismaClientConstructor: (() => null) as any,
         },
         lists: {
           User: {

package/src/commands/generate.ts

@@ -6,9 +6,12 @@ import ora from 'ora'
 import { createJiti } from 'jiti'
 import {
   writePrismaSchema,
+  writePrismaConfig,
   writeTypes,
+  writeLists,
   writeContext,
-  patchPrismaTypes,
+  writePluginTypes,
+  writePrismaExtensions,
 } from '../generator/index.js'
 import { OpenSaasConfig } from '@opensaas/stack-core'
 
@@ -55,9 +58,8 @@ export async function generateCommand() {
 
       try {
         // Import plugin engine (avoid circular dependency)
-        const { executeBeforeGenerateHooks } = await import(
-          '@opensaas/stack-core/config/plugin-engine'
-        )
+        const { executeBeforeGenerateHooks } =
+          await import('@opensaas/stack-core/config/plugin-engine')
         config = await executeBeforeGenerateHooks(config)
         pluginSpinner.succeed(chalk.green('Plugin beforeGenerate hooks complete'))
       } catch (err) {
@@ -70,17 +72,29 @@ export async function generateCommand() {
     const generatorSpinner = ora('Generating schema and types...').start()
     try {
       const prismaSchemaPath = path.join(cwd, 'prisma', 'schema.prisma')
+      const prismaConfigPath = path.join(cwd, 'prisma.config.ts')
       const typesPath = path.join(cwd, '.opensaas', 'types.ts')
+      const listsPath = path.join(cwd, '.opensaas', 'lists.ts')
       const contextPath = path.join(cwd, '.opensaas', 'context.ts')
+      const pluginTypesPath = path.join(cwd, '.opensaas', 'plugin-types.ts')
+      const prismaExtensionsPath = path.join(cwd, '.opensaas', 'prisma-extensions.ts')
 
       writePrismaSchema(config, prismaSchemaPath)
+      writePrismaConfig(config, prismaConfigPath)
       writeTypes(config, typesPath)
+      writeLists(config, listsPath)
       writeContext(config, contextPath)
+      writePluginTypes(config, pluginTypesPath)
+      writePrismaExtensions(config, prismaExtensionsPath)
 
       generatorSpinner.succeed(chalk.green('Schema generation complete'))
       console.log(chalk.green('✅ Prisma schema generated'))
+      console.log(chalk.green('✅ Prisma config generated'))
       console.log(chalk.green('✅ TypeScript types generated'))
+      console.log(chalk.green('✅ Lists namespace generated'))
       console.log(chalk.green('✅ Context factory generated'))
+      console.log(chalk.green('✅ Plugin types generated'))
+      console.log(chalk.green('✅ Prisma extensions generated'))
 
       // Execute afterGenerate hooks if plugins are present
       if (config.plugins && config.plugins.length > 0) {
@@ -95,9 +109,8 @@ export async function generateCommand() {
           }
 
           // Execute afterGenerate hooks
-          const { executeAfterGenerateHooks } = await import(
-            '@opensaas/stack-core/config/plugin-engine'
-          )
+          const { executeAfterGenerateHooks } =
+            await import('@opensaas/stack-core/config/plugin-engine')
           const modifiedFiles = await executeAfterGenerateHooks(config, generatedFiles)
 
           // Write back modified files
@@ -153,18 +166,6 @@ export async function generateCommand() {
       process.exit(1)
     }
 
-    // Patch Prisma types with field transformations
-    const patchSpinner = ora('Patching Prisma types...').start()
-    try {
-      patchPrismaTypes(config, cwd)
-      patchSpinner.succeed(chalk.green('Type patching complete'))
-    } catch (err) {
-      patchSpinner.fail(chalk.red('Failed to patch types'))
-      const message = err instanceof Error ? err.message : String(err)
-      console.error(chalk.red('\n❌ Error:'), message)
-      process.exit(1)
-    }
-
     console.log(chalk.bold('\n✨ Generation complete!\n'))
     console.log(chalk.gray('Next steps:'))
     console.log(chalk.gray('  1. Run: npx prisma db push'))

package/src/commands/mcp.ts

@@ -0,0 +1,135 @@
+/**
+ * MCP command group for AI-assisted development
+ */
+
+import { Command } from 'commander'
+import { spawn } from 'child_process'
+import { fileURLToPath } from 'url'
+import { dirname, join } from 'path'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+
+function getServerPath(): string {
+  // In development: cli/dist/mcp/server/index.js
+  // In production: same structure
+  return join(__dirname, '..', 'mcp', 'server', 'index.js')
+}
+
+function installMCPServer(): Promise<void> {
+  return new Promise((resolve, reject) => {
+    console.log('📦 Installing OpenSaaS Stack MCP server...\n')
+
+    const serverPath = getServerPath()
+    const claudeCommand = ['claude', 'mcp', 'add', 'opensaas-stack', '--', 'node', serverPath]
+
+    console.log(`Running: ${claudeCommand.join(' ')}\n`)
+
+    const child = spawn(claudeCommand[0], claudeCommand.slice(1), {
+      stdio: 'inherit',
+    })
+
+    child.on('close', (code) => {
+      if (code === 0) {
+        console.log('\n✅ OpenSaaS Stack MCP server installed successfully!')
+        console.log('\n📖 Available tools:')
+        console.log('  - opensaas_implement_feature')
+        console.log('  - opensaas_feature_docs')
+        console.log('  - opensaas_list_features')
+        console.log('  - opensaas_suggest_features')
+        console.log('  - opensaas_validate_feature')
+        console.log('\n🚀 Restart Claude Code to use the MCP tools.')
+        resolve()
+      } else {
+        console.error(
+          `\n❌ Installation failed with code ${code}. Please ensure Claude Code is installed.`,
+        )
+        reject(new Error(`Installation failed with code ${code}`))
+      }
+    })
+
+    child.on('error', (error) => {
+      console.error('\n❌ Error during installation:', error.message)
+      console.error('\nMake sure Claude Code is installed and the "claude" command is available.')
+      reject(error)
+    })
+  })
+}
+
+function uninstallMCPServer(): Promise<void> {
+  return new Promise((resolve, reject) => {
+    console.log('🗑️  Uninstalling OpenSaaS Stack MCP server...\n')
+
+    const child = spawn('claude', ['mcp', 'remove', 'opensaas-stack'], {
+      stdio: 'inherit',
+    })
+
+    child.on('close', (code) => {
+      if (code === 0) {
+        console.log('\n✅ OpenSaaS Stack MCP server uninstalled successfully.')
+        resolve()
+      } else {
+        console.error(`\n❌ Uninstall failed with code ${code}`)
+        reject(new Error(`Uninstall failed with code ${code}`))
+      }
+    })
+
+    child.on('error', (error) => {
+      console.error('\n❌ Error during uninstall:', error.message)
+      reject(error)
+    })
+  })
+}
+
+function startMCPServer(): void {
+  console.log('🚀 Starting OpenSaaS Stack MCP server...\n')
+
+  const serverPath = getServerPath()
+
+  const child = spawn('node', [serverPath], {
+    stdio: 'inherit',
+  })
+
+  child.on('error', (error) => {
+    console.error('❌ Error starting server:', error.message)
+    process.exit(1)
+  })
+}
+
+export function createMCPCommand(): Command {
+  const mcp = new Command('mcp')
+  mcp.description('MCP server for AI-assisted development with Claude Code')
+
+  mcp
+    .command('install')
+    .description('Install MCP server in Claude Code')
+    .action(async () => {
+      try {
+        await installMCPServer()
+        process.exit(0)
+      } catch {
+        process.exit(1)
+      }
+    })
+
+  mcp
+    .command('uninstall')
+    .description('Remove MCP server from Claude Code')
+    .action(async () => {
+      try {
+        await uninstallMCPServer()
+        process.exit(0)
+      } catch {
+        process.exit(1)
+      }
+    })
+
+  mcp
+    .command('start')
+    .description('Start MCP server directly (for debugging)')
+    .action(() => {
+      startMCPServer()
+    })
+
+  return mcp
+}